Repository: great-expectations/great_expectations

Issue:
Use cleaner solution for non-truncating division in python 2
Prefer `from __future__ import division` to `1.*x/y`


Discussion:
Done inline during improve_partitions push.

Resolving patch:
diff --git a/great_expectations/rule_based_profiler/parameter_builder/mean_unexpected_map_metric_multi_batch_parameter_builder.py b/great_expectations/rule_based_profiler/parameter_builder/mean_unexpected_map_metric_multi_batch_parameter_builder.py
--- a/great_expectations/rule_based_profiler/parameter_builder/mean_unexpected_map_metric_multi_batch_parameter_builder.py
+++ b/great_expectations/rule_based_profiler/parameter_builder/mean_unexpected_map_metric_multi_batch_parameter_builder.py
@@ -25,7 +25,7 @@ class MeanUnexpectedMapMetricMultiBatchParameterBuilder(
     MetricMultiBatchParameterBuilder
 ):
     """
-    Compute mean unexpected count ratio (as a fraction) of a specified map-style metric across all specified batches.
+    Compute mean unexpected count ratio (as a fraction) of specified map-style metric across every Batch of data given.
     """
 
     exclude_field_names: Set[


Test patch:
diff --git a/tests/rule_based_profiler/parameter_builder/test_mean_unexpected_map_metric_multi_batch_parameter_builder.py b/tests/rule_based_profiler/parameter_builder/test_mean_unexpected_map_metric_multi_batch_parameter_builder.py
--- a/tests/rule_based_profiler/parameter_builder/test_mean_unexpected_map_metric_multi_batch_parameter_builder.py
+++ b/tests/rule_based_profiler/parameter_builder/test_mean_unexpected_map_metric_multi_batch_parameter_builder.py
@@ -12,11 +12,13 @@
 from great_expectations.rule_based_profiler.parameter_builder import (
     MeanUnexpectedMapMetricMultiBatchParameterBuilder,
     MetricMultiBatchParameterBuilder,
+    ParameterBuilder,
 )
 from great_expectations.rule_based_profiler.types import (
     DOMAIN_KWARGS_PARAMETER_FULLY_QUALIFIED_NAME,
     Domain,
     ParameterContainer,
+    ParameterNode,
 )
 from tests.rule_based_profiler.conftest import ATOL, RTOL
 
@@ -29,7 +31,7 @@ def test_instantiation_mean_unexpected_map_metric_multi_batch_parameter_builder(
     )
 
     # noinspection PyUnusedLocal
-    parameter_builder: MeanUnexpectedMapMetricMultiBatchParameterBuilder = (
+    parameter_builder: ParameterBuilder = (
         MeanUnexpectedMapMetricMultiBatchParameterBuilder(
             name="my_name",
             map_metric_name="column_values.nonnull",
@@ -48,7 +50,7 @@ def test_instantiation_mean_unexpected_map_metric_multi_batch_parameter_builder_
 
     with pytest.raises(TypeError) as excinfo:
         # noinspection PyUnusedLocal,PyArgumentList
-        parameter_builder: MeanUnexpectedMapMetricMultiBatchParameterBuilder = (
+        parameter_builder: ParameterBuilder = (
             MeanUnexpectedMapMetricMultiBatchParameterBuilder(
                 name="my_name",
                 map_metric_name="column_values.nonnull",
@@ -63,7 +65,7 @@ def test_instantiation_mean_unexpected_map_metric_multi_batch_parameter_builder_
 
     with pytest.raises(TypeError) as excinfo:
         # noinspection PyUnusedLocal,PyArgumentList
-        parameter_builder: MeanUnexpectedMapMetricMultiBatchParameterBuilder = (
+        parameter_builder: ParameterBuilder = (
             MeanUnexpectedMapMetricMultiBatchParameterBuilder(
                 name="my_name",
                 total_count_parameter_builder_name="my_total_count",
@@ -115,16 +117,18 @@ def test_mean_unexpected_map_metric_multi_batch_parameter_builder_bobby_numeric_
         data_context=data_context,
     )
 
-    mean_unexpected_map_metric_multi_batch_parameter_builder: MeanUnexpectedMapMetricMultiBatchParameterBuilder = MeanUnexpectedMapMetricMultiBatchParameterBuilder(
-        name="my_passenger_count_values_not_null_mean_unexpected_map_metric",
-        map_metric_name="column_values.nonnull",
-        total_count_parameter_builder_name="my_total_count",
-        null_count_parameter_builder_name="my_null_count",
-        metric_domain_kwargs=DOMAIN_KWARGS_PARAMETER_FULLY_QUALIFIED_NAME,
-        metric_value_kwargs=None,
-        evaluation_parameter_builder_configs=None,
-        json_serialize=False,
-        data_context=data_context,
+    mean_unexpected_map_metric_multi_batch_parameter_builder: ParameterBuilder = (
+        MeanUnexpectedMapMetricMultiBatchParameterBuilder(
+            name="my_passenger_count_values_not_null_mean_unexpected_map_metric",
+            map_metric_name="column_values.nonnull",
+            total_count_parameter_builder_name="my_total_count",
+            null_count_parameter_builder_name="my_null_count",
+            metric_domain_kwargs=DOMAIN_KWARGS_PARAMETER_FULLY_QUALIFIED_NAME,
+            metric_value_kwargs=None,
+            evaluation_parameter_builder_configs=None,
+            json_serialize=False,
+            data_context=data_context,
+        )
     )
 
     metric_domain_kwargs: dict = {"column": "passenger_count"}
@@ -163,9 +167,7 @@ def test_mean_unexpected_map_metric_multi_batch_parameter_builder_bobby_numeric_
 
     expected_parameter_value: float = 0.0
 
-    actual_parameter_value: Optional[
-        Any
-    ] = get_parameter_value_and_validate_return_type(
+    parameter_node: ParameterNode = get_parameter_value_and_validate_return_type(
         domain=domain,
         parameter_reference=mean_unexpected_map_metric_multi_batch_parameter_builder.fully_qualified_parameter_name,
         expected_return_type=None,
@@ -176,11 +178,11 @@ def test_mean_unexpected_map_metric_multi_batch_parameter_builder_bobby_numeric_
     rtol: float = RTOL
     atol: float = 5.0e-1 * ATOL
     np.testing.assert_allclose(
-        actual=actual_parameter_value.value,
+        actual=parameter_node.value,
         desired=expected_parameter_value,
         rtol=rtol,
         atol=atol,
-        err_msg=f"Actual value of {actual_parameter_value.value} differs from expected value of {expected_parameter_value} by more than {atol + rtol * abs(actual_parameter_value.value)} tolerance.",
+        err_msg=f"Actual value of {parameter_node.value} differs from expected value of {expected_parameter_value} by more than {atol + rtol * abs(parameter_node.value)} tolerance.",
     )
 
 
@@ -228,16 +230,18 @@ def test_mean_unexpected_map_metric_multi_batch_parameter_builder_bobby_numeric_
         my_total_count_metric_multi_batch_parameter_builder_config,
         my_null_count_metric_multi_batch_parameter_builder_config,
     ]
-    mean_unexpected_map_metric_multi_batch_parameter_builder: MeanUnexpectedMapMetricMultiBatchParameterBuilder = MeanUnexpectedMapMetricMultiBatchParameterBuilder(
-        name="my_passenger_count_values_not_null_mean_unexpected_map_metric",
-        map_metric_name="column_values.nonnull",
-        total_count_parameter_builder_name="my_total_count",
-        null_count_parameter_builder_name="my_null_count",
-        metric_domain_kwargs=DOMAIN_KWARGS_PARAMETER_FULLY_QUALIFIED_NAME,
-        metric_value_kwargs=None,
-        evaluation_parameter_builder_configs=evaluation_parameter_builder_configs,
-        json_serialize=False,
-        data_context=data_context,
+    mean_unexpected_map_metric_multi_batch_parameter_builder: ParameterBuilder = (
+        MeanUnexpectedMapMetricMultiBatchParameterBuilder(
+            name="my_passenger_count_values_not_null_mean_unexpected_map_metric",
+            map_metric_name="column_values.nonnull",
+            total_count_parameter_builder_name="my_total_count",
+            null_count_parameter_builder_name="my_null_count",
+            metric_domain_kwargs=DOMAIN_KWARGS_PARAMETER_FULLY_QUALIFIED_NAME,
+            metric_value_kwargs=None,
+            evaluation_parameter_builder_configs=evaluation_parameter_builder_configs,
+            json_serialize=False,
+            data_context=data_context,
+        )
     )
 
     metric_domain_kwargs: dict = {"column": "passenger_count"}
@@ -263,9 +267,7 @@ def test_mean_unexpected_map_metric_multi_batch_parameter_builder_bobby_numeric_
 
     expected_parameter_value: float = 0.0
 
-    actual_parameter_value: Optional[
-        Any
-    ] = get_parameter_value_and_validate_return_type(
+    parameter_node: ParameterNode = get_parameter_value_and_validate_return_type(
         domain=domain,
         parameter_reference=mean_unexpected_map_metric_multi_batch_parameter_builder.fully_qualified_parameter_name,
         expected_return_type=None,
@@ -276,11 +278,11 @@ def test_mean_unexpected_map_metric_multi_batch_parameter_builder_bobby_numeric_
     rtol: float = RTOL
     atol: float = 5.0e-1 * ATOL
     np.testing.assert_allclose(
-        actual=actual_parameter_value.value,
+        actual=parameter_node.value,
         desired=expected_parameter_value,
         rtol=rtol,
         atol=atol,
-        err_msg=f"Actual value of {actual_parameter_value.value} differs from expected value of {expected_parameter_value} by more than {atol + rtol * abs(actual_parameter_value.value)} tolerance.",
+        err_msg=f"Actual value of {parameter_node.value} differs from expected value of {expected_parameter_value} by more than {atol + rtol * abs(parameter_node.value)} tolerance.",
     )
 
 
@@ -326,16 +328,18 @@ def test_mean_unexpected_map_metric_multi_batch_parameter_builder_bobby_numeric_
     evaluation_parameter_builder_configs: Optional[List[ParameterBuilderConfig]] = [
         my_total_count_metric_multi_batch_parameter_builder_config,
     ]
-    mean_unexpected_map_metric_multi_batch_parameter_builder: MeanUnexpectedMapMetricMultiBatchParameterBuilder = MeanUnexpectedMapMetricMultiBatchParameterBuilder(
-        name="my_passenger_count_values_not_null_mean_unexpected_map_metric",
-        map_metric_name="column_values.nonnull",
-        total_count_parameter_builder_name="my_total_count",
-        null_count_parameter_builder_name="my_null_count",
-        metric_domain_kwargs=DOMAIN_KWARGS_PARAMETER_FULLY_QUALIFIED_NAME,
-        metric_value_kwargs=None,
-        evaluation_parameter_builder_configs=evaluation_parameter_builder_configs,
-        json_serialize=False,
-        data_context=data_context,
+    mean_unexpected_map_metric_multi_batch_parameter_builder: ParameterBuilder = (
+        MeanUnexpectedMapMetricMultiBatchParameterBuilder(
+            name="my_passenger_count_values_not_null_mean_unexpected_map_metric",
+            map_metric_name="column_values.nonnull",
+            total_count_parameter_builder_name="my_total_count",
+            null_count_parameter_builder_name="my_null_count",
+            metric_domain_kwargs=DOMAIN_KWARGS_PARAMETER_FULLY_QUALIFIED_NAME,
+            metric_value_kwargs=None,
+            evaluation_parameter_builder_configs=evaluation_parameter_builder_configs,
+            json_serialize=False,
+            data_context=data_context,
+        )
     )
 
     metric_domain_kwargs: dict = {"column": "passenger_count"}
@@ -368,9 +372,7 @@ def test_mean_unexpected_map_metric_multi_batch_parameter_builder_bobby_numeric_
 
     expected_parameter_value: float = 0.0
 
-    actual_parameter_value: Optional[
-        Any
-    ] = get_parameter_value_and_validate_return_type(
+    parameter_node: ParameterNode = get_parameter_value_and_validate_return_type(
         domain=domain,
         parameter_reference=mean_unexpected_map_metric_multi_batch_parameter_builder.fully_qualified_parameter_name,
         expected_return_type=None,
@@ -381,11 +383,11 @@ def test_mean_unexpected_map_metric_multi_batch_parameter_builder_bobby_numeric_
     rtol: float = RTOL
     atol: float = 5.0e-1 * ATOL
     np.testing.assert_allclose(
-        actual=actual_parameter_value.value,
+        actual=parameter_node.value,
         desired=expected_parameter_value,
         rtol=rtol,
         atol=atol,
-        err_msg=f"Actual value of {actual_parameter_value.value} differs from expected value of {expected_parameter_value} by more than {atol + rtol * abs(actual_parameter_value.value)} tolerance.",
+        err_msg=f"Actual value of {parameter_node.value} differs from expected value of {expected_parameter_value} by more than {atol + rtol * abs(parameter_node.value)} tolerance.",
     )
 
 
@@ -427,16 +429,18 @@ def test_mean_unexpected_map_metric_multi_batch_parameter_builder_bobby_datetime
         data_context=data_context,
     )
 
-    mean_unexpected_map_metric_multi_batch_parameter_builder: MeanUnexpectedMapMetricMultiBatchParameterBuilder = MeanUnexpectedMapMetricMultiBatchParameterBuilder(
-        name="my_pickup_datetime_count_values_unique_mean_unexpected_map_metric",
-        map_metric_name="column_values.nonnull",
-        total_count_parameter_builder_name="my_total_count",
-        null_count_parameter_builder_name="my_null_count",
-        metric_domain_kwargs=DOMAIN_KWARGS_PARAMETER_FULLY_QUALIFIED_NAME,
-        metric_value_kwargs=None,
-        evaluation_parameter_builder_configs=None,
-        json_serialize=False,
-        data_context=data_context,
+    mean_unexpected_map_metric_multi_batch_parameter_builder: ParameterBuilder = (
+        MeanUnexpectedMapMetricMultiBatchParameterBuilder(
+            name="my_pickup_datetime_count_values_unique_mean_unexpected_map_metric",
+            map_metric_name="column_values.nonnull",
+            total_count_parameter_builder_name="my_total_count",
+            null_count_parameter_builder_name="my_null_count",
+            metric_domain_kwargs=DOMAIN_KWARGS_PARAMETER_FULLY_QUALIFIED_NAME,
+            metric_value_kwargs=None,
+            evaluation_parameter_builder_configs=None,
+            json_serialize=False,
+            data_context=data_context,
+        )
     )
 
     metric_domain_kwargs: dict = {"column": "pickup_datetime"}
@@ -475,9 +479,7 @@ def test_mean_unexpected_map_metric_multi_batch_parameter_builder_bobby_datetime
 
     expected_parameter_value: float = 3.89e-3
 
-    actual_parameter_value: Optional[
-        Any
-    ] = get_parameter_value_and_validate_return_type(
+    parameter_node: ParameterNode = get_parameter_value_and_validate_return_type(
         domain=domain,
         parameter_reference=mean_unexpected_map_metric_multi_batch_parameter_builder.fully_qualified_parameter_name,
         expected_return_type=None,
@@ -488,11 +490,11 @@ def test_mean_unexpected_map_metric_multi_batch_parameter_builder_bobby_datetime
     rtol: float = RTOL
     atol: float = 5.0e-1 * ATOL
     np.testing.assert_allclose(
-        actual=actual_parameter_value.value,
+        actual=parameter_node.value,
         desired=expected_parameter_value,
         rtol=rtol,
         atol=atol,
-        err_msg=f"Actual value of {actual_parameter_value.value} differs from expected value of {expected_parameter_value} by more than {atol + rtol * abs(actual_parameter_value.value)} tolerance.",
+        err_msg=f"Actual value of {parameter_node.value} differs from expected value of {expected_parameter_value} by more than {atol + rtol * abs(parameter_node.value)} tolerance.",
     )
 
 
@@ -540,16 +542,18 @@ def test_mean_unexpected_map_metric_multi_batch_parameter_builder_bobby_datetime
         my_total_count_metric_multi_batch_parameter_builder_config,
         my_null_count_metric_multi_batch_parameter_builder_config,
     ]
-    mean_unexpected_map_metric_multi_batch_parameter_builder: MeanUnexpectedMapMetricMultiBatchParameterBuilder = MeanUnexpectedMapMetricMultiBatchParameterBuilder(
-        name="my_pickup_datetime_count_values_unique_mean_unexpected_map_metric",
-        map_metric_name="column_values.nonnull",
-        total_count_parameter_builder_name="my_total_count",
-        null_count_parameter_builder_name="my_null_count",
-        metric_domain_kwargs=DOMAIN_KWARGS_PARAMETER_FULLY_QUALIFIED_NAME,
-        metric_value_kwargs=None,
-        evaluation_parameter_builder_configs=evaluation_parameter_builder_configs,
-        json_serialize=False,
-        data_context=data_context,
+    mean_unexpected_map_metric_multi_batch_parameter_builder: ParameterBuilder = (
+        MeanUnexpectedMapMetricMultiBatchParameterBuilder(
+            name="my_pickup_datetime_count_values_unique_mean_unexpected_map_metric",
+            map_metric_name="column_values.nonnull",
+            total_count_parameter_builder_name="my_total_count",
+            null_count_parameter_builder_name="my_null_count",
+            metric_domain_kwargs=DOMAIN_KWARGS_PARAMETER_FULLY_QUALIFIED_NAME,
+            metric_value_kwargs=None,
+            evaluation_parameter_builder_configs=evaluation_parameter_builder_configs,
+            json_serialize=False,
+            data_context=data_context,
+        )
     )
 
     metric_domain_kwargs: dict = {"column": "pickup_datetime"}
@@ -575,9 +579,7 @@ def test_mean_unexpected_map_metric_multi_batch_parameter_builder_bobby_datetime
 
     expected_parameter_value: float = 3.89e-3
 
-    actual_parameter_value: Optional[
-        Any
-    ] = get_parameter_value_and_validate_return_type(
+    parameter_node: ParameterNode = get_parameter_value_and_validate_return_type(
         domain=domain,
         parameter_reference=mean_unexpected_map_metric_multi_batch_parameter_builder.fully_qualified_parameter_name,
         expected_return_type=None,
@@ -588,11 +590,11 @@ def test_mean_unexpected_map_metric_multi_batch_parameter_builder_bobby_datetime
     rtol: float = RTOL
     atol: float = 5.0e-1 * ATOL
     np.testing.assert_allclose(
-        actual=actual_parameter_value.value,
+        actual=parameter_node.value,
         desired=expected_parameter_value,
         rtol=rtol,
         atol=atol,
-        err_msg=f"Actual value of {actual_parameter_value.value} differs from expected value of {expected_parameter_value} by more than {atol + rtol * abs(actual_parameter_value.value)} tolerance.",
+        err_msg=f"Actual value of {parameter_node.value} differs from expected value of {expected_parameter_value} by more than {atol + rtol * abs(parameter_node.value)} tolerance.",
     )
 
 
@@ -638,16 +640,18 @@ def test_mean_unexpected_map_metric_multi_batch_parameter_builder_bobby_datetime
     evaluation_parameter_builder_configs: Optional[List[ParameterBuilderConfig]] = [
         my_null_count_metric_multi_batch_parameter_builder_config,
     ]
-    mean_unexpected_map_metric_multi_batch_parameter_builder: MeanUnexpectedMapMetricMultiBatchParameterBuilder = MeanUnexpectedMapMetricMultiBatchParameterBuilder(
-        name="my_pickup_datetime_count_values_unique_mean_unexpected_map_metric",
-        map_metric_name="column_values.nonnull",
-        total_count_parameter_builder_name="my_total_count",
-        null_count_parameter_builder_name="my_null_count",
-        metric_domain_kwargs=DOMAIN_KWARGS_PARAMETER_FULLY_QUALIFIED_NAME,
-        metric_value_kwargs=None,
-        evaluation_parameter_builder_configs=evaluation_parameter_builder_configs,
-        json_serialize=False,
-        data_context=data_context,
+    mean_unexpected_map_metric_multi_batch_parameter_builder: ParameterBuilder = (
+        MeanUnexpectedMapMetricMultiBatchParameterBuilder(
+            name="my_pickup_datetime_count_values_unique_mean_unexpected_map_metric",
+            map_metric_name="column_values.nonnull",
+            total_count_parameter_builder_name="my_total_count",
+            null_count_parameter_builder_name="my_null_count",
+            metric_domain_kwargs=DOMAIN_KWARGS_PARAMETER_FULLY_QUALIFIED_NAME,
+            metric_value_kwargs=None,
+            evaluation_parameter_builder_configs=evaluation_parameter_builder_configs,
+            json_serialize=False,
+            data_context=data_context,
+        )
     )
 
     metric_domain_kwargs: dict = {"column": "pickup_datetime"}
@@ -680,9 +684,7 @@ def test_mean_unexpected_map_metric_multi_batch_parameter_builder_bobby_datetime
 
     expected_parameter_value: float = 3.89e-3
 
-    actual_parameter_value: Optional[
-        Any
-    ] = get_parameter_value_and_validate_return_type(
+    parameter_node: ParameterNode = get_parameter_value_and_validate_return_type(
         domain=domain,
         parameter_reference=mean_unexpected_map_metric_multi_batch_parameter_builder.fully_qualified_parameter_name,
         expected_return_type=None,
@@ -693,11 +695,11 @@ def test_mean_unexpected_map_metric_multi_batch_parameter_builder_bobby_datetime
     rtol: float = RTOL
     atol: float = 5.0e-1 * ATOL
     np.testing.assert_allclose(
-        actual=actual_parameter_value.value,
+        actual=parameter_node.value,
         desired=expected_parameter_value,
         rtol=rtol,
         atol=atol,
-        err_msg=f"Actual value of {actual_parameter_value.value} differs from expected value of {expected_parameter_value} by more than {atol + rtol * abs(actual_parameter_value.value)} tolerance.",
+        err_msg=f"Actual value of {parameter_node.value} differs from expected value of {expected_parameter_value} by more than {atol + rtol * abs(parameter_node.value)} tolerance.",
     )
 
 
@@ -708,22 +710,18 @@ def test_mean_unexpected_map_metric_multi_batch_parameter_builder_bobby_check_se
         bobby_columnar_table_multi_batch_deterministic_data_context
     )
 
-    batch_request: dict = {
-        "datasource_name": "taxi_pandas",
-        "data_connector_name": "monthly",
-        "data_asset_name": "my_reports",
-    }
-
-    mean_unexpected_map_metric_multi_batch_parameter_builder: MeanUnexpectedMapMetricMultiBatchParameterBuilder = MeanUnexpectedMapMetricMultiBatchParameterBuilder(
-        name="my_pickup_datetime_count_values_unique_mean_unexpected_map_metric",
-        map_metric_name="column_values.nonnull",
-        total_count_parameter_builder_name="my_total_count",
-        null_count_parameter_builder_name="my_null_count",
-        metric_domain_kwargs=DOMAIN_KWARGS_PARAMETER_FULLY_QUALIFIED_NAME,
-        metric_value_kwargs=None,
-        evaluation_parameter_builder_configs=None,
-        json_serialize=False,
-        data_context=data_context,
+    mean_unexpected_map_metric_multi_batch_parameter_builder: ParameterBuilder = (
+        MeanUnexpectedMapMetricMultiBatchParameterBuilder(
+            name="my_pickup_datetime_count_values_unique_mean_unexpected_map_metric",
+            map_metric_name="column_values.nonnull",
+            total_count_parameter_builder_name="my_total_count",
+            null_count_parameter_builder_name="my_null_count",
+            metric_domain_kwargs=DOMAIN_KWARGS_PARAMETER_FULLY_QUALIFIED_NAME,
+            metric_value_kwargs=None,
+            evaluation_parameter_builder_configs=None,
+            json_serialize=False,
+            data_context=data_context,
+        )
     )
 
     # Note: "evaluation_parameter_builder_configs" is not one of "ParameterBuilder" formal property attributes.
@@ -750,12 +748,6 @@ def test_mean_unexpected_map_metric_multi_batch_parameter_builder_bobby_check_se
         bobby_columnar_table_multi_batch_deterministic_data_context
     )
 
-    batch_request: dict = {
-        "datasource_name": "taxi_pandas",
-        "data_connector_name": "monthly",
-        "data_asset_name": "my_reports",
-    }
-
     my_total_count_metric_multi_batch_parameter_builder_config: ParameterBuilderConfig = ParameterBuilderConfig(
         module_name="great_expectations.rule_based_profiler.parameter_builder",
         class_name="MetricMultiBatchParameterBuilder",
@@ -787,16 +779,18 @@ def test_mean_unexpected_map_metric_multi_batch_parameter_builder_bobby_check_se
         my_total_count_metric_multi_batch_parameter_builder_config,
         my_null_count_metric_multi_batch_parameter_builder_config,
     ]
-    mean_unexpected_map_metric_multi_batch_parameter_builder: MeanUnexpectedMapMetricMultiBatchParameterBuilder = MeanUnexpectedMapMetricMultiBatchParameterBuilder(
-        name="my_pickup_datetime_count_values_unique_mean_unexpected_map_metric",
-        map_metric_name="column_values.nonnull",
-        total_count_parameter_builder_name="my_total_count",
-        null_count_parameter_builder_name="my_null_count",
-        metric_domain_kwargs=DOMAIN_KWARGS_PARAMETER_FULLY_QUALIFIED_NAME,
-        metric_value_kwargs=None,
-        evaluation_parameter_builder_configs=evaluation_parameter_builder_configs,
-        json_serialize=False,
-        data_context=data_context,
+    mean_unexpected_map_metric_multi_batch_parameter_builder: ParameterBuilder = (
+        MeanUnexpectedMapMetricMultiBatchParameterBuilder(
+            name="my_pickup_datetime_count_values_unique_mean_unexpected_map_metric",
+            map_metric_name="column_values.nonnull",
+            total_count_parameter_builder_name="my_total_count",
+            null_count_parameter_builder_name="my_null_count",
+            metric_domain_kwargs=DOMAIN_KWARGS_PARAMETER_FULLY_QUALIFIED_NAME,
+            metric_value_kwargs=None,
+            evaluation_parameter_builder_configs=evaluation_parameter_builder_configs,
+            json_serialize=False,
+            data_context=data_context,
+        )
     )
 
     # Note: "evaluation_parameter_builder_configs" is not one of "ParameterBuilder" formal property attributes.
diff --git a/tests/rule_based_profiler/parameter_builder/test_numeric_metric_range_multi_batch_parameter_builder.py b/tests/rule_based_profiler/parameter_builder/test_numeric_metric_range_multi_batch_parameter_builder.py
--- a/tests/rule_based_profiler/parameter_builder/test_numeric_metric_range_multi_batch_parameter_builder.py
+++ b/tests/rule_based_profiler/parameter_builder/test_numeric_metric_range_multi_batch_parameter_builder.py
@@ -11,6 +11,7 @@
 from great_expectations.rule_based_profiler.helpers.util import NP_EPSILON
 from great_expectations.rule_based_profiler.parameter_builder import (
     NumericMetricRangeMultiBatchParameterBuilder,
+    ParameterBuilder,
 )
 from great_expectations.rule_based_profiler.types import (
     Domain,
@@ -34,14 +35,16 @@ def test_bootstrap_numeric_metric_range_multi_batch_parameter_builder_bobby(
         "data_asset_name": "my_reports",
     }
 
-    numeric_metric_range_parameter_builder: NumericMetricRangeMultiBatchParameterBuilder = NumericMetricRangeMultiBatchParameterBuilder(
-        name="row_count_range",
-        metric_name="table.row_count",
-        estimator="bootstrap",
-        false_positive_rate=1.0e-2,
-        round_decimals=0,
-        json_serialize=False,
-        data_context=data_context,
+    numeric_metric_range_parameter_builder: ParameterBuilder = (
+        NumericMetricRangeMultiBatchParameterBuilder(
+            name="row_count_range",
+            metric_name="table.row_count",
+            estimator="bootstrap",
+            false_positive_rate=1.0e-2,
+            round_decimals=0,
+            json_serialize=False,
+            data_context=data_context,
+        )
     )
 
     variables: Optional[ParameterContainer] = None
@@ -83,7 +86,7 @@ def test_bootstrap_numeric_metric_range_multi_batch_parameter_builder_bobby(
         },
     }
 
-    actual_value_parameter_node: ParameterNode = (
+    parameter_node: ParameterNode = (
         get_parameter_value_by_fully_qualified_parameter_name(
             fully_qualified_parameter_name=fully_qualified_parameter_name_for_value,
             domain=domain,
@@ -91,14 +94,14 @@ def test_bootstrap_numeric_metric_range_multi_batch_parameter_builder_bobby(
         )
     )
 
-    actual_value: np.ndarray = actual_value_parameter_node.pop("value")
-    actual_value_parameter_node["value"] = None
+    actual_value: np.ndarray = parameter_node.pop("value")
+    parameter_node["value"] = None
 
-    actual_estimation_histogram: np.ndarray = actual_value_parameter_node.details.pop(
+    actual_estimation_histogram: np.ndarray = parameter_node.details.pop(
         "estimation_histogram"
     )
 
-    assert actual_value_parameter_node == expected_value_dict
+    assert parameter_node == expected_value_dict
 
     expected_value: np.ndarray = np.array([7510, 8806])
 
@@ -159,15 +162,17 @@ def test_oneshot_numeric_metric_range_multi_batch_parameter_builder_bobby(
     expected_value_dict: dict
     actual_value_dict: dict
 
-    numeric_metric_range_parameter_builder: NumericMetricRangeMultiBatchParameterBuilder = NumericMetricRangeMultiBatchParameterBuilder(
-        name="column_min_range",
-        metric_name="column.min",
-        metric_domain_kwargs=metric_domain_kwargs,
-        estimator="oneshot",
-        false_positive_rate=1.0e-2,
-        round_decimals=1,
-        json_serialize=False,
-        data_context=data_context,
+    numeric_metric_range_parameter_builder: ParameterBuilder = (
+        NumericMetricRangeMultiBatchParameterBuilder(
+            name="column_min_range",
+            metric_name="column.min",
+            metric_domain_kwargs=metric_domain_kwargs,
+            estimator="oneshot",
+            false_positive_rate=1.0e-2,
+            round_decimals=1,
+            json_serialize=False,
+            data_context=data_context,
+        )
     )
 
     variables: Optional[ParameterContainer] = None
@@ -209,7 +214,7 @@ def test_oneshot_numeric_metric_range_multi_batch_parameter_builder_bobby(
         },
     }
 
-    actual_value_parameter_node: ParameterNode = (
+    parameter_node: ParameterNode = (
         get_parameter_value_by_fully_qualified_parameter_name(
             fully_qualified_parameter_name=fully_qualified_parameter_name_for_value,
             domain=domain,
@@ -217,14 +222,14 @@ def test_oneshot_numeric_metric_range_multi_batch_parameter_builder_bobby(
         )
     )
 
-    actual_values_01: np.ndarray = actual_value_parameter_node.pop("value")
-    actual_value_parameter_node["value"] = None
+    actual_values_01: np.ndarray = parameter_node.pop("value")
+    parameter_node["value"] = None
 
-    actual_estimation_histogram: np.ndarray = actual_value_parameter_node.details.pop(
+    actual_estimation_histogram: np.ndarray = parameter_node.details.pop(
         "estimation_histogram"
     )
 
-    assert actual_value_parameter_node == expected_value_dict
+    assert parameter_node == expected_value_dict
 
     actual_value_01_lower: float = actual_values_01[0]
     actual_value_01_upper: float = actual_values_01[1]
@@ -277,7 +282,7 @@ def test_oneshot_numeric_metric_range_multi_batch_parameter_builder_bobby(
         batch_request=batch_request,
     )
 
-    actual_value_parameter_node: ParameterNode = (
+    parameter_node: ParameterNode = (
         get_parameter_value_by_fully_qualified_parameter_name(
             fully_qualified_parameter_name=fully_qualified_parameter_name_for_value,
             domain=domain,
@@ -285,14 +290,14 @@ def test_oneshot_numeric_metric_range_multi_batch_parameter_builder_bobby(
         )
     )
 
-    actual_values_05 = actual_value_parameter_node.pop("value")
-    actual_value_parameter_node["value"] = None
+    actual_values_05 = parameter_node.pop("value")
+    parameter_node["value"] = None
 
-    actual_estimation_histogram: np.ndarray = actual_value_parameter_node.details.pop(
+    actual_estimation_histogram: np.ndarray = parameter_node.details.pop(
         "estimation_histogram"
     )
 
-    assert actual_value_parameter_node == expected_value_dict
+    assert parameter_node == expected_value_dict
 
     actual_value_05_lower: float = actual_values_05[0]
     actual_value_05_upper: float = actual_values_05[1]
@@ -343,13 +348,15 @@ def test_bootstrap_numeric_metric_range_multi_batch_parameter_builder_bobby_fals
         "data_asset_name": "my_reports",
     }
 
-    numeric_metric_range_parameter_builder: NumericMetricRangeMultiBatchParameterBuilder = NumericMetricRangeMultiBatchParameterBuilder(
-        name="row_count_range",
-        metric_name="table.row_count",
-        estimator="bootstrap",
-        false_positive_rate=1.0,
-        round_decimals=0,
-        data_context=data_context,
+    numeric_metric_range_parameter_builder: ParameterBuilder = (
+        NumericMetricRangeMultiBatchParameterBuilder(
+            name="row_count_range",
+            metric_name="table.row_count",
+            estimator="bootstrap",
+            false_positive_rate=1.0,
+            round_decimals=0,
+            data_context=data_context,
+        )
     )
 
     variables: Optional[ParameterContainer] = None
@@ -393,13 +400,15 @@ def test_bootstrap_numeric_metric_range_multi_batch_parameter_builder_bobby_fals
         "data_asset_name": "my_reports",
     }
 
-    numeric_metric_range_parameter_builder: NumericMetricRangeMultiBatchParameterBuilder = NumericMetricRangeMultiBatchParameterBuilder(
-        name="row_count_range",
-        metric_name="table.row_count",
-        estimator="bootstrap",
-        false_positive_rate=-0.05,
-        round_decimals=0,
-        data_context=data_context,
+    numeric_metric_range_parameter_builder: ParameterBuilder = (
+        NumericMetricRangeMultiBatchParameterBuilder(
+            name="row_count_range",
+            metric_name="table.row_count",
+            estimator="bootstrap",
+            false_positive_rate=-0.05,
+            round_decimals=0,
+            data_context=data_context,
+        )
     )
 
     variables: Optional[ParameterContainer] = None
@@ -443,13 +452,15 @@ def test_bootstrap_numeric_metric_range_multi_batch_parameter_builder_bobby_fals
         "data_asset_name": "my_reports",
     }
 
-    numeric_metric_range_parameter_builder: NumericMetricRangeMultiBatchParameterBuilder = NumericMetricRangeMultiBatchParameterBuilder(
-        name="row_count_range",
-        metric_name="table.row_count",
-        estimator="bootstrap",
-        false_positive_rate=0.0,
-        round_decimals=0,
-        data_context=data_context,
+    numeric_metric_range_parameter_builder: ParameterBuilder = (
+        NumericMetricRangeMultiBatchParameterBuilder(
+            name="row_count_range",
+            metric_name="table.row_count",
+            estimator="bootstrap",
+            false_positive_rate=0.0,
+            round_decimals=0,
+            data_context=data_context,
+        )
     )
 
     variables: Optional[ParameterContainer] = None
@@ -500,13 +511,15 @@ def test_bootstrap_numeric_metric_range_multi_batch_parameter_builder_bobby_fals
     # what if user tries a false positive rate smaller than NP_EPSILON (by an order of magnitude in this case)?
     smaller_than_np_epsilon_false_positive_rate: float = NP_EPSILON / 10
 
-    numeric_metric_range_parameter_builder: NumericMetricRangeMultiBatchParameterBuilder = NumericMetricRangeMultiBatchParameterBuilder(
-        name="row_count_range",
-        metric_name="table.row_count",
-        estimator="bootstrap",
-        false_positive_rate=smaller_than_np_epsilon_false_positive_rate,
-        round_decimals=0,
-        data_context=data_context,
+    numeric_metric_range_parameter_builder: ParameterBuilder = (
+        NumericMetricRangeMultiBatchParameterBuilder(
+            name="row_count_range",
+            metric_name="table.row_count",
+            estimator="bootstrap",
+            false_positive_rate=smaller_than_np_epsilon_false_positive_rate,
+            round_decimals=0,
+            data_context=data_context,
+        )
     )
 
     variables: Optional[ParameterContainer] = None
diff --git a/tests/rule_based_profiler/parameter_builder/test_regex_pattern_string_parameter_builder.py b/tests/rule_based_profiler/parameter_builder/test_regex_pattern_string_parameter_builder.py
--- a/tests/rule_based_profiler/parameter_builder/test_regex_pattern_string_parameter_builder.py
+++ b/tests/rule_based_profiler/parameter_builder/test_regex_pattern_string_parameter_builder.py
@@ -19,6 +19,7 @@
     get_parameter_value_and_validate_return_type,
 )
 from great_expectations.rule_based_profiler.parameter_builder import (
+    ParameterBuilder,
     RegexPatternStringParameterBuilder,
 )
 from great_expectations.rule_based_profiler.types import (
@@ -134,7 +135,7 @@ def test_regex_pattern_string_parameter_builder_alice(
         r"^\S{8}-\S{4}-\S{4}-\S{4}-\S{12}$",
     ]
 
-    regex_pattern_string_parameter: RegexPatternStringParameterBuilder = (
+    regex_pattern_string_parameter: ParameterBuilder = (
         RegexPatternStringParameterBuilder(
             name="my_regex_pattern_string_parameter_builder",
             metric_domain_kwargs=metric_domain_kwargs,
@@ -286,14 +287,12 @@ def test_regex_pattern_string_parameter_builder_bobby_no_match(
     }
     threshold: float = 0.9
 
-    regex_parameter: RegexPatternStringParameterBuilder = (
-        RegexPatternStringParameterBuilder(
-            name="my_regex_pattern_string_parameter_builder",
-            metric_domain_kwargs=metric_domain_kwargs,
-            candidate_regexes=candidate_regexes,
-            threshold=threshold,
-            data_context=data_context,
-        )
+    regex_parameter: ParameterBuilder = RegexPatternStringParameterBuilder(
+        name="my_regex_pattern_string_parameter_builder",
+        metric_domain_kwargs=metric_domain_kwargs,
+        candidate_regexes=candidate_regexes,
+        threshold=threshold,
+        data_context=data_context,
     )
     domain: Domain = Domain(
         rule_name="my_rule",
@@ -360,7 +359,7 @@ def test_regex_wrong_domain(mock_data_context: mock.MagicMock, batch_fixture: Ba
     metric_domain_kwargs: dict = {"column": "c"}
     candidate_regexes: List[str] = [r"^\d{1}$"]
 
-    regex_pattern_string_parameter_builder: RegexPatternStringParameterBuilder = (
+    regex_pattern_string_parameter_builder: ParameterBuilder = (
         RegexPatternStringParameterBuilder(
             name="my_regex_pattern_string_parameter_builder",
             metric_domain_kwargs=metric_domain_kwargs,
@@ -407,7 +406,7 @@ def test_regex_single_candidate(
     metric_domain_kwargs: dict = {"column": "b"}
     candidate_regexes: List[str] = [r"^\d{1}$"]
 
-    regex_pattern_string_parameter_builder: RegexPatternStringParameterBuilder = (
+    regex_pattern_string_parameter_builder: ParameterBuilder = (
         RegexPatternStringParameterBuilder(
             name="my_regex_pattern_string_parameter_builder",
             metric_domain_kwargs=metric_domain_kwargs,
@@ -474,7 +473,7 @@ def test_regex_two_candidates(mock_data_context: mock.MagicMock, batch_fixture:
     metric_domain_kwargs: dict = {"column": "b"}
     candidate_regexes: List[str] = [r"^\d{1}$", r"^\d{3}$"]
 
-    regex_pattern_string_parameter_builder: RegexPatternStringParameterBuilder = (
+    regex_pattern_string_parameter_builder: ParameterBuilder = (
         RegexPatternStringParameterBuilder(
             name="my_regex_pattern_string_parameter_builder",
             metric_domain_kwargs=metric_domain_kwargs,
diff --git a/tests/rule_based_profiler/parameter_builder/test_simple_date_format_string_parameter_builder.py b/tests/rule_based_profiler/parameter_builder/test_simple_date_format_string_parameter_builder.py
--- a/tests/rule_based_profiler/parameter_builder/test_simple_date_format_string_parameter_builder.py
+++ b/tests/rule_based_profiler/parameter_builder/test_simple_date_format_string_parameter_builder.py
@@ -9,12 +9,17 @@
     get_parameter_value_and_validate_return_type,
 )
 from great_expectations.rule_based_profiler.parameter_builder import (
+    ParameterBuilder,
     SimpleDateFormatStringParameterBuilder,
 )
 from great_expectations.rule_based_profiler.parameter_builder.simple_date_format_string_parameter_builder import (
     DEFAULT_CANDIDATE_STRINGS,
 )
-from great_expectations.rule_based_profiler.types import Domain, ParameterContainer
+from great_expectations.rule_based_profiler.types import (
+    Domain,
+    ParameterContainer,
+    ParameterNode,
+)
 
 
 def test_simple_date_format_parameter_builder_instantiation(
@@ -38,7 +43,7 @@ def test_simple_date_format_parameter_builder_zero_batch_id_error(
 ):
     data_context: DataContext = alice_columnar_table_single_batch_context
 
-    date_format_string_parameter: SimpleDateFormatStringParameterBuilder = (
+    date_format_string_parameter: ParameterBuilder = (
         SimpleDateFormatStringParameterBuilder(
             name="my_simple_date_format_string_parameter_builder",
             data_context=data_context,
@@ -177,14 +182,14 @@ def test_simple_date_format_parameter_builder_alice(
         },
     }
 
-    actual_value: dict = get_parameter_value_and_validate_return_type(
+    parameter_node: ParameterNode = get_parameter_value_and_validate_return_type(
         parameter_reference=fully_qualified_parameter_name_for_value,
         expected_return_type=dict,
         domain=domain,
         parameters=parameters,
     )
 
-    assert actual_value == expected_value
+    assert parameter_node == expected_value
 
 
 def test_simple_date_format_parameter_builder_bobby(
@@ -247,14 +252,14 @@ def test_simple_date_format_parameter_builder_bobby(
     )
     expected_value: str = "%Y-%m-%d %H:%M:%S"
 
-    actual_value: str = get_parameter_value_and_validate_return_type(
+    parameter_node: ParameterNode = get_parameter_value_and_validate_return_type(
         parameter_reference=fully_qualified_parameter_name_for_value,
         expected_return_type=str,
         domain=domain,
         parameters=parameters,
     )
 
-    assert actual_value == expected_value
+    assert parameter_node == expected_value
 
     fully_qualified_parameter_name_for_meta: str = (
         "$parameter.my_simple_date_format_string_parameter_builder.details"
diff --git a/tests/rule_based_profiler/parameter_builder/test_value_set_multi_batch_parameter_builder.py b/tests/rule_based_profiler/parameter_builder/test_value_set_multi_batch_parameter_builder.py
--- a/tests/rule_based_profiler/parameter_builder/test_value_set_multi_batch_parameter_builder.py
+++ b/tests/rule_based_profiler/parameter_builder/test_value_set_multi_batch_parameter_builder.py
@@ -11,7 +11,11 @@
     ValueSetMultiBatchParameterBuilder,
     _get_unique_values_from_nested_collection_of_sets,
 )
-from great_expectations.rule_based_profiler.types import Domain, ParameterContainer
+from great_expectations.rule_based_profiler.types import (
+    Domain,
+    ParameterContainer,
+    ParameterNode,
+)
 
 
 def test_instantiation_value_set_multi_batch_parameter_builder(
@@ -57,15 +61,6 @@ def test_value_set_multi_batch_parameter_builder_alice_single_batch_numeric(
     }
 
     metric_domain_kwargs: dict = {"column": "event_type"}
-
-    value_set_multi_batch_parameter_builder: ValueSetMultiBatchParameterBuilder = (
-        ValueSetMultiBatchParameterBuilder(
-            name="my_event_type_value_set",
-            metric_domain_kwargs=metric_domain_kwargs,
-            data_context=data_context,
-        )
-    )
-
     domain: Domain = Domain(
         rule_name="my_rule",
         domain_type=MetricDomainTypes.COLUMN,
@@ -76,6 +71,14 @@ def test_value_set_multi_batch_parameter_builder_alice_single_batch_numeric(
         domain.id: parameter_container,
     }
 
+    value_set_multi_batch_parameter_builder: ValueSetMultiBatchParameterBuilder = (
+        ValueSetMultiBatchParameterBuilder(
+            name="my_event_type_value_set",
+            metric_domain_kwargs=metric_domain_kwargs,
+            data_context=data_context,
+        )
+    )
+
     assert parameter_container.parameter_nodes is None
 
     variables: Optional[ParameterContainer] = None
@@ -106,9 +109,7 @@ def test_value_set_multi_batch_parameter_builder_alice_single_batch_numeric(
     }
 
     fully_qualified_parameter_name_for_value: str = "$parameter.my_event_type_value_set"
-    actual_parameter_value: Optional[
-        Any
-    ] = get_parameter_value_and_validate_return_type(
+    parameter_node: ParameterNode = get_parameter_value_and_validate_return_type(
         domain=domain,
         parameter_reference=fully_qualified_parameter_name_for_value,
         expected_return_type=None,
@@ -116,8 +117,8 @@ def test_value_set_multi_batch_parameter_builder_alice_single_batch_numeric(
         parameters=parameters,
     )
 
-    assert sorted(actual_parameter_value.value) == expected_parameter_value["value"]
-    assert actual_parameter_value.details == expected_parameter_value["details"]
+    assert sorted(parameter_node.value) == expected_parameter_value["value"]
+    assert parameter_node.details == expected_parameter_value["details"]
 
 
 def test_value_set_multi_batch_parameter_builder_alice_single_batch_string(
@@ -136,15 +137,6 @@ def test_value_set_multi_batch_parameter_builder_alice_single_batch_string(
     }
 
     metric_domain_kwargs: dict = {"column": "user_agent"}
-
-    value_set_multi_batch_parameter_builder: ValueSetMultiBatchParameterBuilder = (
-        ValueSetMultiBatchParameterBuilder(
-            name="my_user_agent_value_set",
-            metric_domain_kwargs=metric_domain_kwargs,
-            data_context=data_context,
-        )
-    )
-
     domain: Domain = Domain(
         rule_name="my_rule",
         domain_type=MetricDomainTypes.COLUMN,
@@ -155,6 +147,14 @@ def test_value_set_multi_batch_parameter_builder_alice_single_batch_string(
         domain.id: parameter_container,
     }
 
+    value_set_multi_batch_parameter_builder: ValueSetMultiBatchParameterBuilder = (
+        ValueSetMultiBatchParameterBuilder(
+            name="my_user_agent_value_set",
+            metric_domain_kwargs=metric_domain_kwargs,
+            data_context=data_context,
+        )
+    )
+
     assert parameter_container.parameter_nodes is None
 
     variables: Optional[ParameterContainer] = None
@@ -187,9 +187,7 @@ def test_value_set_multi_batch_parameter_builder_alice_single_batch_string(
     }
 
     fully_qualified_parameter_name_for_value: str = "$parameter.my_user_agent_value_set"
-    actual_parameter_value: Optional[
-        Any
-    ] = get_parameter_value_and_validate_return_type(
+    parameter_node: ParameterNode = get_parameter_value_and_validate_return_type(
         domain=domain,
         parameter_reference=fully_qualified_parameter_name_for_value,
         expected_return_type=None,
@@ -197,8 +195,8 @@ def test_value_set_multi_batch_parameter_builder_alice_single_batch_string(
         parameters=parameters,
     )
 
-    assert sorted(actual_parameter_value.value) == expected_parameter_value["value"]
-    assert actual_parameter_value.details == expected_parameter_value["details"]
+    assert sorted(parameter_node.value) == expected_parameter_value["value"]
+    assert parameter_node.details == expected_parameter_value["details"]
 
 
 def test_value_set_multi_batch_parameter_builder_bobby_numeric(
@@ -223,8 +221,6 @@ def test_value_set_multi_batch_parameter_builder_bobby_numeric(
         )
     )
 
-    variables: Optional[ParameterContainer] = None
-
     metric_domain_kwargs: dict = {"column": "passenger_count"}
     domain: Domain = Domain(
         rule_name="my_rule",
@@ -238,6 +234,7 @@ def test_value_set_multi_batch_parameter_builder_bobby_numeric(
 
     assert parameter_container.parameter_nodes is None
 
+    variables: Optional[ParameterContainer] = None
     value_set_multi_batch_parameter_builder.build_parameters(
         domain=domain,
         variables=variables,
@@ -267,9 +264,7 @@ def test_value_set_multi_batch_parameter_builder_bobby_numeric(
     fully_qualified_parameter_name_for_value: str = (
         "$parameter.my_passenger_count_value_set"
     )
-    actual_parameter_value: Optional[
-        Any
-    ] = get_parameter_value_and_validate_return_type(
+    parameter_node: ParameterNode = get_parameter_value_and_validate_return_type(
         domain=domain,
         parameter_reference=fully_qualified_parameter_name_for_value,
         expected_return_type=None,
@@ -277,8 +272,8 @@ def test_value_set_multi_batch_parameter_builder_bobby_numeric(
         parameters=parameters,
     )
 
-    assert sorted(actual_parameter_value.value) == expected_parameter_value["value"]
-    assert actual_parameter_value.details == expected_parameter_value["details"]
+    assert sorted(parameter_node.value) == expected_parameter_value["value"]
+    assert parameter_node.details == expected_parameter_value["details"]
 
 
 def test_value_set_multi_batch_parameter_builder_bobby_string(
@@ -303,8 +298,6 @@ def test_value_set_multi_batch_parameter_builder_bobby_string(
         )
     )
 
-    variables: Optional[ParameterContainer] = None
-
     metric_domain_kwargs: dict = {"column": "store_and_fwd_flag"}
     domain: Domain = Domain(
         rule_name="my_rule",
@@ -318,6 +311,7 @@ def test_value_set_multi_batch_parameter_builder_bobby_string(
 
     assert parameter_container.parameter_nodes is None
 
+    variables: Optional[ParameterContainer] = None
     value_set_multi_batch_parameter_builder.build_parameters(
         domain=domain,
         variables=variables,
@@ -347,9 +341,7 @@ def test_value_set_multi_batch_parameter_builder_bobby_string(
     fully_qualified_parameter_name_for_value: str = (
         "$parameter.my_store_and_fwd_flag_value_set"
     )
-    actual_parameter_value: Optional[
-        Any
-    ] = get_parameter_value_and_validate_return_type(
+    parameter_node: ParameterNode = get_parameter_value_and_validate_return_type(
         domain=domain,
         parameter_reference=fully_qualified_parameter_name_for_value,
         expected_return_type=None,
@@ -357,8 +349,8 @@ def test_value_set_multi_batch_parameter_builder_bobby_string(
         parameters=parameters,
     )
 
-    assert sorted(actual_parameter_value.value) == expected_parameter_value["value"]
-    assert actual_parameter_value.details == expected_parameter_value["details"]
+    assert sorted(parameter_node.value) == expected_parameter_value["value"]
+    assert parameter_node.details == expected_parameter_value["details"]
 
 
 @pytest.mark.parametrize(