diff --git a/tests/builder_tests.py b/tests/builder_tests.py
index 0eac39a7..5a5a6d55 100644
--- a/tests/builder_tests.py
+++ b/tests/builder_tests.py
@@ -50,7 +50,8 @@ def setUp(self):
             self.survey_out_dict, utils.path_to_text_fixture("how_old_are_you.json")
         )
 
-    def test_create_from_file_object(self):
+    @staticmethod
+    def test_create_from_file_object():
         path = utils.path_to_text_fixture("yes_or_no_question.xls")
         with open(path, "rb") as f:
             create_survey_from_xls(f)
diff --git a/tests/pyxform_test_case.py b/tests/pyxform_test_case.py
index a3b17311..3849ac52 100644
--- a/tests/pyxform_test_case.py
+++ b/tests/pyxform_test_case.py
@@ -8,7 +8,7 @@
 import re
 import tempfile
 from dataclasses import dataclass
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Dict, Iterable, List, Optional, Set, Tuple, Union
 from unittest import TestCase
 
 from lxml import etree
@@ -18,7 +18,7 @@
 
 from pyxform.builder import create_survey_element_from_dict
 from pyxform.errors import PyXFormError
-from pyxform.utils import NSMAP
+from pyxform.utils import NSMAP, coalesce
 from pyxform.validators.odk_validate import ODKValidateError, check_xform
 from pyxform.xls2json import workbook_to_json
 from tests.test_utils.md_table import md_table_to_ss_structure
@@ -29,7 +29,7 @@
 
 
 if TYPE_CHECKING:
-    from typing import Dict, List, Set, Tuple, Union
+    from pyxform.survey import Survey
 
     NSMAPSubs: "List[Tuple[str, str]]"
 
@@ -49,11 +49,21 @@ class MatcherContext:
 class PyxformMarkdown:
     """Transform markdown formatted xlsform to a pyxform survey object"""
 
-    def md_to_pyxform_survey(self, md_raw, kwargs=None, autoname=True, warnings=None):
-        if kwargs is None:
-            kwargs = {}
+    def md_to_pyxform_survey(
+        self,
+        md_raw: str,
+        name: Optional[str] = None,
+        title: Optional[str] = None,
+        id_string: Optional[str] = None,
+        debug: bool = False,
+        autoname: bool = True,
+        warnings: List[str] = None,
+    ):
         if autoname:
-            kwargs = self._autoname_inputs(kwargs)
+            kwargs = self._autoname_inputs(name=name, title=title, id_string=id_string)
+            name = kwargs["name"]
+            title = kwargs["title"]
+            id_string = kwargs["id_string"]
         _md = []
         for line in md_raw.split("\n"):
             if re.match(r"^\s+#", line):
@@ -67,7 +77,7 @@ def md_to_pyxform_survey(self, md_raw, kwargs=None, autoname=True, warnings=None
                 _md.append(line.strip())
         md = "\n".join(_md)
 
-        if kwargs.get("debug"):
+        if debug:
             logger.debug(md)
 
         def list_to_dicts(arr):
@@ -87,18 +97,31 @@ def _row_to_dict(row):
         for sheet, contents in md_table_to_ss_structure(md):
             sheets[sheet] = list_to_dicts(contents)
 
-        return self._ss_structure_to_pyxform_survey(sheets, kwargs, warnings=warnings)
+        return self._ss_structure_to_pyxform_survey(
+            ss_structure=sheets,
+            name=name,
+            title=title,
+            id_string=id_string,
+            warnings=warnings,
+        )
 
     @staticmethod
-    def _ss_structure_to_pyxform_survey(ss_structure, kwargs, warnings=None):
+    def _ss_structure_to_pyxform_survey(
+        ss_structure: Dict,
+        name: Optional[str] = None,
+        title: Optional[str] = None,
+        id_string: Optional[str] = None,
+        warnings: List[str] = None,
+    ):
         # using existing methods from the builder
-        imported_survey_json = workbook_to_json(ss_structure, warnings=warnings)
-        # ideally, when all these tests are working, this would be
-        # refactored as well
+        imported_survey_json = workbook_to_json(
+            workbook_dict=ss_structure, warnings=warnings
+        )
+        # ideally, when all these tests are working, this would be refactored as well
         survey = create_survey_element_from_dict(imported_survey_json)
-        survey.name = kwargs.get("name", "data")
-        survey.title = kwargs.get("title")
-        survey.id_string = kwargs.get("id_string")
+        survey.name = coalesce(name, "data")
+        survey.title = title
+        survey.id_string = id_string
 
         return survey
 
@@ -119,106 +142,133 @@ def _run_odk_validate(xml):
             assert not os.path.isfile(tmp.name)
 
     @staticmethod
-    def _autoname_inputs(kwargs):
+    def _autoname_inputs(
+        name: Optional[str] = None,
+        title: Optional[str] = None,
+        id_string: Optional[str] = None,
+    ) -> Dict[str, str]:
         """
-        title and name are necessary for surveys, but not always convenient to
-        include in test cases, so this will pull a default value
-        from the stack trace.
+        Fill in any blank inputs with default values.
         """
-        if "name" not in kwargs.keys():
-            kwargs["name"] = "test_name"
-        if "title" not in kwargs.keys():
-            kwargs["title"] = "test_title"
-        if "id_string" not in kwargs.keys():
-            kwargs["id_string"] = "test_id"
-
-        return kwargs
+        return {
+            "name": coalesce(name, "test_name"),
+            "title": coalesce(title, "test_title"),
+            "id_string": coalesce(id_string, "test_id"),
+        }
 
 
 class PyxformTestCase(PyxformMarkdown, TestCase):
     maxDiff = None
 
-    def assertPyxformXform(self, **kwargs):
+    def assertPyxformXform(
+        self,
+        # Survey input
+        md: str = None,
+        ss_structure: Dict = None,
+        survey: "Survey" = None,
+        # XForm assertions
+        xml__xpath_match: Iterable[str] = None,
+        xml__xpath_exact: Iterable[Tuple[str, Set[str]]] = None,
+        xml__xpath_count: Iterable[Tuple[str, int]] = None,
+        # XForm assertions - deprecated
+        xml__contains: Iterable[str] = None,
+        xml__excludes: Iterable[str] = None,
+        model__contains: Iterable[str] = None,
+        model__excludes: Iterable[str] = None,
+        itext__contains: Iterable[str] = None,
+        itext__excludes: Iterable[str] = None,
+        instance__contains: Iterable[str] = None,
+        # Errors assertions
+        error__contains: Iterable[str] = None,
+        error__not_contains: Iterable[str] = None,
+        odk_validate_error__contains: Iterable[str] = None,
+        warnings__contains: Iterable[str] = None,
+        warnings__not_contains: Iterable[str] = None,
+        warnings_count: Optional[int] = None,
+        errored: bool = False,
+        # Optional extras
+        name: str = None,
+        id_string: str = None,
+        title: str = None,
+        warnings: List[str] = None,
+        run_odk_validate: bool = False,
+        debug: bool = False,
+    ):
         """
-        PyxformTestCase.assertPyxformXform() named arguments:
-        -----------------------------------------------------
-
-        one of these possible survey input types
-          * md: (str) a markdown formatted xlsform (easy to read in code)
-                [consider a plugin to help with formatting md tables,
-                 e.g. https://github.com/vkocubinsky/SublimeTableEditor].
-                Escape a literal pipe value with a single back-slash.
-          * ss_structure: (dict) a python dictionary with sheets and their
-                contents. best used in cases where testing whitespace and
-                cells' type is important
-          * survey: (pyxform.survey.Survey) easy for reuse within a test
-          # Note: XLS is not implemented at this time. You can use builder to
-          create a pyxform Survey object
-
-        one or many of these string "matchers":
-          * xml__contains: an array of strings which exist in the
-                resulting xml. [xml|model|instance|itext]_excludes are also supported.
-          * error__contains: a list of strings which should exist in the error
-          * error__not_contains: a list of strings which should not exist in the error
-          * odk_validate_error__contains: list of strings; run_odk_validate must be set
-          * warnings__contains: a list of strings which should exist in the warnings
-          * warnings__not_contains: a list of strings which should not exist in the warnings
-          * warnings_count: the number of expected warning messages
-          * xml__excludes: an array of strings which should not exist in the resulting
-               xml. [xml|model|instance|itext]_excludes are also supported.
-          * xml__xpath_exact: A list of tuples where the first tuple element is an XPath
-               expression and the second tuple element is a set of exact string match
-               results that are expected.
-          * xml__xpath_count: A list of tuples where the first tuple element is an XPath
-               expression and the second tuple element is the integer number of match
-               results that are expected.
-          * xml__xpath_match: A list of XPath expression strings for which exactly one
-               match result each is expected. Effectively a shortcut for
-               xml__xpath_count with a count of 1.
-
-        For each of the xpath_* matchers above, if the XPath expression is looking for an
+        One survey input:
+        :param md: a markdown formatted xlsform (easy to read in code). Escape a literal
+          pipe value with a single back-slash.
+        :param ss_structure: a dictionary with sheets and their contents. Best used in
+          cases where testing whitespace and cells' type is important.
+        :param survey: easy for reuse within a test
+        # Note: XLS is not implemented at this time. You can use builder to create a
+        pyxform Survey object
+
+        One or more XForm assertions:
+        :param xml__xpath_exact: A list of tuples where the first tuple element is an
+          XPath expression and the second tuple element is a set of exact string match
+          results that are expected. E.g. `[(".//some_xpath", {"match1", "match2"}), ...]`
+        :param xml__xpath_count: A list of tuples where the first tuple element is an
+          XPath expression and the second tuple element is the integer number of match
+          results that are expected. E.g. `[(".//some_xpath", 1), (".//an_xpath", 2)]`
+        :param xml__xpath_match: A list of XPath expression strings for which exactly one
+          match result each is expected. Effectively a shortcut for xml__xpath_count with
+          a count of 1. E.g. `[".//some_xpath", ".//an_xpath"]`
+
+        For each of the xpath_* assertions above, if the XPath expression looks for an
         element in the 'default' namespace (xforms) then use an 'x' namespace prefix for
         the element. For example to find input nodes in the body: ".//h:body/x:input".
-        This 'x' prefix is not required for attributes. When writing a xpath_* test, use
-        debug=True to show the XPath match results.
-
-        optional other parameters passed to pyxform:
-          * errored: (bool) if the xlsform is not supposed to compile,
-                this must be True
-          * name: (str) a valid xml tag to be used as the form name
-          * id_string: (str)
-          * title: (str)
-          * run_odk_validate: (bool) when True, runs ODK Validate process
-                Default value = False because it slows down tests
-          * warnings: (list) a list to use for storing warnings for inspection.
-          * debug: (bool) when True, log details of the test to stdout. Details include
-                the input survey markdown, the XML document, XPath match strings.
+        This 'x' prefix is not required for attributes. When writing a xpath_* test, the
+        option debug=True can be used to show the XPath match results.
+
+        XForm assertions that should not be used in new tests:
+        :param xml__contains: Strings that should which exist in the XForm.
+        :param xml__excludes: Strings that should not exist in the XForm.
+        :param model__contains: Strings that should exist in the XForm model.
+        :param model__excludes: Strings that should not exist in the XForm model.
+        :param itext__contains: Strings that should exist in the XForm itext.
+        :param itext__excludes: Strings that should not exist in the XForm itext.
+        :param instance__contains: Strings that should exist in the XForm main instance.
+
+        One or more Pyxform errors assertions:
+        :param error__contains: Strings which should exist in the PyxformError.
+        :param error__not_contains: Strings which should not exist in the PyxformError.
+        :param odk_validate_error__contains: Strings which should exist in the ODK
+          Validate error. The parameter `run_odk_validate` must be set for this to work.
+        :param warnings__contains: Strings which should exist in the warnings.
+        :param warnings__not_contains: Strings which should not exist in the warnings.
+        :param warnings_count: the number of expected warning messages.
+        :param errored: If True, it is expected that a PyxformError will be raised.
+
+        Optional extra parameters:
+        :param name: a valid xml tag, for the root element in the XForm main instance.
+        :param id_string: an identifier, for the XForm main instance @id attribute.
+        :param title: a name, for the XForm header title.
+        :param warnings: a list to use for storing warnings for inspection.
+        :param run_odk_validate: If True, run ODK Validate on the XForm output.
+        :param debug: If True, log details of the test to stdout. Details include the
+          input survey markdown, the XML document, XPath match strings.
         """
-        debug = kwargs.get("debug", False)
-        expecting_invalid_survey = kwargs.get("errored", False)
         errors = []
-        warnings = kwargs.get("warnings", [])
+        warnings = coalesce(warnings, [])
         xml_nodes = {}
 
-        run_odk_validate = kwargs.get("run_odk_validate", False)
-        odk_validate_error__contains = kwargs.get("odk_validate_error__contains", [])
+        odk_validate_error__contains = coalesce(odk_validate_error__contains, [])
         survey_valid = True
 
         try:
-            if "md" in kwargs.keys():
-                kwargs = self._autoname_inputs(kwargs)
+            if md is not None:
                 survey = self.md_to_pyxform_survey(
-                    kwargs.get("md"), kwargs, warnings=warnings
+                    md_raw=md,
+                    warnings=warnings,
+                    **self._autoname_inputs(name=name, title=title, id_string=id_string),
                 )
-            elif "ss_structure" in kwargs.keys():
-                kwargs = self._autoname_inputs(kwargs)
+            elif ss_structure is not None:
                 survey = self._ss_structure_to_pyxform_survey(
-                    kwargs.get("ss_structure"),
-                    kwargs,
+                    ss_structure=ss_structure,
                     warnings=warnings,
+                    **self._autoname_inputs(name=name, title=title, id_string=id_string),
                 )
-            else:
-                survey = kwargs.get("survey")
 
             xml = survey._to_pretty_xml()
             root = etree.fromstring(xml.encode("utf-8"))
@@ -247,7 +297,7 @@ def _pull_xml_node_from_root(element_selector):
                 if _r:
                     return _r[0]
 
-                return False
+                return None
 
             for _n in ["model", "instance", "itext"]:
                 xml_nodes[_n] = _pull_xml_node_from_root(_n)
@@ -264,13 +314,17 @@ def _pull_xml_node_from_root(element_selector):
             if debug:
                 logger.debug("<xml unavailable />")
                 logger.debug("ERROR: '%s'", errors[0])
+            if not errored:
+                raise PyxformTestError(
+                    "Expected valid survey but compilation failed. Try correcting the "
+                    "error with 'debug=True', setting 'errored=True', and or optionally "
+                    "'error__contains=[...]'\nError(s): " + "\n".join(errors)
+                )
         except ODKValidateError as e:
             if not odk_validate_error__contains:
                 raise PyxformTestError(
-                    "ODK Validate error was thrown but "
-                    + "'odk_validate_error__contains'"
-                    + " was empty:"
-                    + str(e)
+                    "ODK Validate error was thrown but 'odk_validate_error__contains' "
+                    "was empty: " + str(e)
                 )
             for v_err in odk_validate_error__contains:
                 self.assertContains(
@@ -278,115 +332,90 @@ def _pull_xml_node_from_root(element_selector):
                 )
 
         if survey_valid:
+            if errored:
+                raise PyxformTestError("Expected survey to be invalid.")
 
-            def _check(keyword, verb):
-                verb_str = "%s__%s" % (keyword, verb)
+            xml_nodes_str = {}
 
-                bad_kwarg = "%s_%s" % (code, verb)
-                if bad_kwarg in kwargs:
-                    good_kwarg = "%s__%s" % (code, verb)
-                    raise SyntaxError(
-                        ("'%s' is not a valid parameter. " "Use double underscores: '%s'")
-                        % (bad_kwarg, good_kwarg)
+            def get_xml_nodes_str(node_key: str) -> str:
+                if node_key not in xml_nodes_str:
+                    xml_nodes_str[node_key] = etree.tostring(
+                        xml_nodes[node_key], encoding=str, pretty_print=True
                     )
+                return xml_nodes_str[node_key]
+
+            string_test_specs = (
+                (xml__contains, "xml", self.assertContains),
+                (xml__excludes, "xml", self.assertNotContains),
+                (instance__contains, "instance", self.assertContains),
+                (model__contains, "model", self.assertContains),
+                (model__excludes, "model", self.assertNotContains),
+                (itext__contains, "itext", self.assertContains),
+                (itext__excludes, "itext", self.assertNotContains),
+            )
 
-                def check_content(content, expected):
-                    if content is None:
-                        self.fail(msg="No '{}' found in document.".format(keyword))
-                    cstr = etree.tostring(content, encoding=str, pretty_print=True)
-                    matcher_context = MatcherContext(
-                        debug=debug,
-                        nsmap_xpath=final_nsmap_xpath,
-                        nsmap_subs=final_nsmap_subs,
-                        content_str=cstr,
-                    )
-                    for idx, i in enumerate(expected, start=1):
-                        if verb == "contains":
-                            self.assertContains(cstr, i, msg_prefix=keyword)
-                        elif verb == "excludes":
-                            self.assertNotContains(cstr, i, msg_prefix=keyword)
-                        elif verb == "xpath_exact":
-                            self.assert_xpath_exact(
-                                matcher_context=matcher_context,
-                                content=content,
-                                xpath=i[0],
-                                expected=i[1],
-                                case_num=idx,
-                            )
-                        elif verb == "xpath_count":
-                            self.assert_xpath_count(
-                                matcher_context=matcher_context,
-                                content=content,
-                                xpath=i[0],
-                                expected=i[1],
-                                case_num=idx,
-                            )
-                        elif verb == "xpath_match":
-                            self.assert_xpath_count(
-                                matcher_context=matcher_context,
-                                content=content,
-                                xpath=i,
-                                expected=1,
-                                case_num=idx,
-                            )
-
-                return verb_str, check_content
-
-            if "body_contains" in kwargs or "body__contains" in kwargs:
-                raise SyntaxError(
-                    "Invalid parameter: 'body__contains'." "Use 'xml__contains' instead"
+            for test_spec, key, test_func in string_test_specs:
+                if test_spec is not None:
+                    for i in test_spec:
+                        test_func(content=get_xml_nodes_str(key), text=i, msg_prefix=key)
+
+            def get_xpath_matcher_context():
+                return MatcherContext(
+                    debug=debug,
+                    nsmap_xpath=final_nsmap_xpath,
+                    nsmap_subs=final_nsmap_subs,
+                    content_str=get_xml_nodes_str("xml"),
                 )
 
-            for code in ["xml", "instance", "model", "itext"]:
-                for _verb in ["contains", "excludes"]:
-                    (code__str, checker) = _check(code, _verb)
-                    if kwargs.get(code__str):
-                        checker(xml_nodes[code], kwargs[code__str])
-
-            for xpath_verb in ("xpath_exact", "xpath_count", "xpath_match"):
-                code__str, checker = _check("xml", xpath_verb)
-                if kwargs.get(code__str) is not None:
-                    checker(xml_nodes["xml"], kwargs[code__str])
-
-        if not survey_valid and not expecting_invalid_survey:
-            raise PyxformTestError(
-                "Expected valid survey but compilation failed. "
-                "Try correcting the error with 'debug=True', "
-                "setting 'errored=True', "
-                "and or optionally 'error__contains=[...]'"
-                "\nError(s): " + "\n".join(errors)
-            )
-        elif survey_valid and expecting_invalid_survey:
-            raise PyxformTestError("Expected survey to be invalid.")
-
-        search_test_kwargs = (
-            "error__contains",
-            "error__not_contains",
-            "warnings__contains",
-            "warnings__not_contains",
+            if xml__xpath_exact is not None:
+                xpath_matcher = get_xpath_matcher_context()
+                for idx, i in enumerate(xml__xpath_exact, start=1):
+                    self.assert_xpath_exact(
+                        matcher_context=xpath_matcher,
+                        content=xml_nodes["xml"],
+                        xpath=i[0],
+                        expected=i[1],
+                        case_num=idx,
+                    )
+
+            if xml__xpath_count is not None:
+                xpath_matcher = get_xpath_matcher_context()
+                for idx, i in enumerate(xml__xpath_count, start=1):
+                    self.assert_xpath_count(
+                        matcher_context=xpath_matcher,
+                        content=xml_nodes["xml"],
+                        xpath=i[0],
+                        expected=i[1],
+                        case_num=idx,
+                    )
+
+            if xml__xpath_match is not None:
+                xpath_matcher = get_xpath_matcher_context()
+                for idx, i in enumerate(xml__xpath_match, start=1):
+                    self.assert_xpath_count(
+                        matcher_context=xpath_matcher,
+                        content=xml_nodes["xml"],
+                        xpath=i,
+                        expected=1,
+                        case_num=idx,
+                    )
+
+        problem_test_specs = (
+            (error__contains, "errors", errors, self.assertContains),
+            (error__not_contains, "errors", errors, self.assertNotContains),
+            (warnings__contains, "warnings", warnings, self.assertContains),
+            (warnings__not_contains, "warnings", warnings, self.assertNotContains),
         )
-        for k in search_test_kwargs:
-            if k not in kwargs:
-                continue
-            if k.endswith("__contains"):
-                assertion = self.assertContains
-            elif k.endswith("__not_contains"):
-                assertion = self.assertNotContains
-            else:
-                raise PyxformTestError("Unexpected search test kwarg: {}".format(k))
-            if k.startswith("error"):
-                joined = "\n".join(errors)
-            elif k.startswith("warnings"):
-                joined = "\n".join(warnings)
-            else:
-                raise PyxformTestError("Unexpected search test kwarg: {}".format(k))
-            for text in kwargs[k]:
-                assertion(joined, text, msg_prefix=k)
-        if "warnings_count" in kwargs:
-            c = kwargs.get("warnings_count")
-            if not isinstance(c, int):
-                PyxformTestError("warnings_count must be an integer.")
-            self.assertEqual(c, len(warnings))
+        for test_spec, prefix, test_obj, test_func in problem_test_specs:
+            if test_spec is not None:
+                test_str = "\n".join(test_obj)
+                for i in test_spec:
+                    test_func(content=test_str, text=i, msg_prefix=prefix)
+
+        if warnings_count is not None:
+            if not isinstance(warnings_count, int):
+                raise PyxformTestError("warnings_count must be an integer.")
+            self.assertEqual(warnings_count, len(warnings))
 
     @staticmethod
     def _assert_contains(content, text, msg_prefix):
diff --git a/tests/test_choices_sheet.py b/tests/test_choices_sheet.py
index ffecf3c2..e230ca1c 100644
--- a/tests/test_choices_sheet.py
+++ b/tests/test_choices_sheet.py
@@ -90,7 +90,6 @@ def test_choices_without_labels__for_dynamic_selects__allowed_by_pyxform(self):
             |          | choices            | 1    |       |
             |          | choices            | 2    |       |
             """,
-            run_odk_validate=False,
             xml__xpath_match=[
                 xpq.body_select1_itemset("a"),
                 """
@@ -120,18 +119,18 @@ def test_choices_extra_columns_output_order_matches_xlsform(self):
         """
         self.assertPyxformXform(
             md=md,
-            xml__xpath_contains=[
+            xml__xpath_match=[
                 """
                 /h:html/h:head/x:model/x:instance[@id='choices']/x:root/x:item[
-                  ./x:name[position() = 1 and text() = '1']
-                  and ./x:geometry[position() = 2]
+                  ./x:name = ./x:*[position() = 1 and text() = '1']
+                  and ./x:geometry = ./x:*[position() = 2 and text() = '46.5841618 7.0801379 0 0']
                 ]
-                """
+                """,
                 """
                 /h:html/h:head/x:model/x:instance[@id='choices']/x:root/x:item[
-                  ./x:name[position() = 1 and text() = '2']
-                  and ./x:geometry[position() = 2]
+                  ./x:name = ./x:*[position() = 1 and text() = '2']
+                  and ./x:geometry = ./x:*[position() = 2 and text() = '35.8805082 76.515057 0 0']
                 ]
-                """
+                """,
             ],
         )
diff --git a/tests/test_entities_create.py b/tests/test_entities_create.py
index 79d9154a..bd3d9055 100644
--- a/tests/test_entities_create.py
+++ b/tests/test_entities_create.py
@@ -372,7 +372,6 @@ def test_saveto_in_group__works(self):
             |          | dataset     | label  |       |         |
             |          | trees       | ${size}|       |         |
             """,
-            errored=False,
         )
 
     def test_list_name_alias_to_dataset(self):
@@ -404,7 +403,6 @@ def test_entities_columns__all_expected(self):
             |          | dataset      | label | update_if  | create_if  | entity_id |
             |          | trees        | a     | id != ''   | id = ''    | ${a}      |
             """,
-            errored=False,
             warnings_count=0,
         )
 
diff --git a/tests/test_fields.py b/tests/test_fields.py
index d124f92b..a1df844c 100644
--- a/tests/test_fields.py
+++ b/tests/test_fields.py
@@ -210,5 +210,4 @@ def test_field_name_may_match_form_name(self):
             |         | date        | date     | Observation date  |
             |         | text        | activity | Describe activity |
             """,
-            errored=False,
         )
diff --git a/tests/test_form_name.py b/tests/test_form_name.py
index bcfcc1e1..79dd78f0 100644
--- a/tests/test_form_name.py
+++ b/tests/test_form_name.py
@@ -19,7 +19,6 @@ def test_default_to_data_when_no_name(self):
             |          | id_string | name |
             |          | some-id   | data |
             """,
-            kwargs={},
             autoname=False,
         )
 
diff --git a/tests/test_pyxformtestcase.py b/tests/test_pyxformtestcase.py
index 8b68a8c4..e0b1acaa 100644
--- a/tests/test_pyxformtestcase.py
+++ b/tests/test_pyxformtestcase.py
@@ -47,7 +47,6 @@ def test_vanilla_survey(self):
         """
         self.assertPyxformXform(
             ss_structure={"survey": [{"type": "note", "name": "n1", "label": "Note 1"}]},
-            errored=False,
         )
 
 
@@ -63,7 +62,6 @@ def test_formid_is_not_none(self):
             |        | type | name | label |
             |        | note | q    | Q     |
             """,
-            {},
             autoname=True,
         )
 
diff --git a/tests/test_randomize_itemsets.py b/tests/test_randomize_itemsets.py
index 11544bb5..6a5d90b0 100644
--- a/tests/test_randomize_itemsets.py
+++ b/tests/test_randomize_itemsets.py
@@ -132,7 +132,7 @@ def test_randomized_external_xml_instance(self):
     def test_randomized_select_one_bad_param(self):
         self.assertPyxformXform(
             name="data",
-            errored="true",
+            errored=True,
             md="""
             | survey |                    |         |       |                |
             |        | type               | name    | label | parameters     |
@@ -152,7 +152,7 @@ def test_randomized_select_one_bad_param(self):
     def test_randomized_select_one_bad_randomize(self):
         self.assertPyxformXform(
             name="data",
-            errored="true",
+            errored=True,
             md="""
             | survey |                    |         |       |                  |
             |        | type               | name    | label | parameters       |
@@ -171,7 +171,7 @@ def test_randomized_select_one_bad_randomize(self):
     def test_randomized_select_one_bad_seed(self):
         self.assertPyxformXform(
             name="data",
-            errored="true",
+            errored=True,
             md="""
             | survey |                    |         |       |                             |
             |        | type               | name    | label | parameters                  |
@@ -190,7 +190,7 @@ def test_randomized_select_one_bad_seed(self):
     def test_randomized_select_one_seed_without_randomize(self):
         self.assertPyxformXform(
             name="data",
-            errored="true",
+            errored=True,
             md="""
             | survey |                    |         |       |                  |
             |        | type               | name    | label | parameters       |
diff --git a/tests/test_repeat.py b/tests/test_repeat.py
index 35627b5a..94e4b403 100644
--- a/tests/test_repeat.py
+++ b/tests/test_repeat.py
@@ -376,7 +376,6 @@ def test_choice_from_previous_repeat_answers_with_choice_filter(self):
                 '<itemset nodeset="/data/rep[starts-with( ./name , &quot;b&quot;)]">',
                 '<itemset nodeset="/data/rep[ ./demographics/age  &gt; 18]">',
             ],
-            run_odk_validate=False,
         )
 
     def test_choice_from_previous_repeat_answers_in_child_repeat(self):
@@ -997,7 +996,6 @@ def test_repeat_count_item_with_same_suffix_as_repeat_is_ok(self):
         """
         self.assertPyxformXform(
             md=md,
-            debug=True,
             xml__xpath_match=[
                 # repeat references existing count element directly.
                 """
diff --git a/tests/test_secondary_instance_translations.py b/tests/test_secondary_instance_translations.py
index ea1eb9fc..417e63ed 100644
--- a/tests/test_secondary_instance_translations.py
+++ b/tests/test_secondary_instance_translations.py
@@ -139,8 +139,6 @@ def test_select_with_choice_filter_and_translations_generates_single_translation
             name="data",
             id_string="some-id",
             md=xform_md,
-            errored=False,
-            debug=False,
             itext__contains=[
                 '<text id="list-0">',
                 '<text id="list-1">',
@@ -171,7 +169,6 @@ def test_select_with_dynamic_option_label__and_choice_filter__and_no_translation
         self.assertPyxformXform(
             name="data",
             md=xform_md,
-            debug=False,
             itext__contains=[
                 '<text id="choices-0">',
                 '<value> One - <output value=" /data/txt "/>',
diff --git a/tests/test_settings_auto_send_delete.py b/tests/test_settings_auto_send_delete.py
index cdb4cc8e..ed88628f 100644
--- a/tests/test_settings_auto_send_delete.py
+++ b/tests/test_settings_auto_send_delete.py
@@ -18,7 +18,6 @@ def test_settings_auto_send_true(self):
             |          | auto_send    |           |           |
             |          | true         |           |           |
             """,
-            debug=False,
             xml__contains=['<submission orx:auto-send="true"/>'],
         )
 
@@ -34,7 +33,6 @@ def test_settings_auto_delete_true(self):
             |          | auto_delete  |           |           |
             |          | true         |           |           |
             """,
-            debug=False,
             xml__contains=['<submission orx:auto-delete="true"/>'],
         )
 
@@ -50,7 +48,6 @@ def test_settings_auto_send_delete_false(self):
             |          | auto_delete  | auto_send |           |
             |          | false        | false     |           |
             """,
-            debug=False,
             xml__contains=['<submission orx:auto-delete="false" orx:auto-send="false"/>'],
         )
 
@@ -72,7 +69,6 @@ def test_settings_without_submission_url_does_not_generate_method_attribute(self
             |          | bRHBG7TQm+Afnx0s5E2bGIT5jB5cj9YaX6BqZSeodpafQjpXEJg6uufxF1Ni3Btv   |           |           |
             |          |  4wIDAQAB                                                          |           |           |
             """,
-            debug=False,
             xml__contains=[
                 '<submission base64RsaPublicKey="MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwOHPJWD9zc8JPBZj/UtC" orx:auto-send="false"/>'
             ],
@@ -90,7 +86,6 @@ def test_settings_with_submission_url_generates_method_attribute(self):
             |          | submission_url                                        | auto_send |           |
             |          | https://odk.ona.io/random_person/submission           | false     |           |
             """,
-            debug=False,
             xml__contains=[
                 '<submission action="https://odk.ona.io/random_person/submission" method="post" orx:auto-send="false"/>'
             ],
diff --git a/tests/test_sheet_columns.py b/tests/test_sheet_columns.py
index 134e57d2..9b730b0f 100644
--- a/tests/test_sheet_columns.py
+++ b/tests/test_sheet_columns.py
@@ -28,7 +28,6 @@ def test_missing_name_but_has_alias_of_name(self):
         self.assertPyxformXform(
             name="invalidcols",
             ss_structure={"survey": [{"value": "q1", "type": "text", "label": "label"}]},
-            errored=False,
         )
 
     def test_label_or_hint__must_be_provided(self):
@@ -101,8 +100,6 @@ def test_column_case(self):
             |        | integer | age     | the age       |
             |        | text    | gender  | the gender    |
             """,
-            errored=False,
-            debug=False,
         )
 
 
@@ -111,7 +108,8 @@ class InvalidChoiceSheetColumnsTests(PyxformTestCase):
     Invalid choice sheet column tests
     """
 
-    def _simple_choice_ss(self, choice_sheet=None):
+    @staticmethod
+    def _simple_choice_ss(choice_sheet=None):
         """
         Return simple choices sheet
         """
@@ -142,7 +140,6 @@ def test_valid_choices_sheet_passes(self):
                     {"list_name": "l1", "name": "c2", "label": "choice 2"},
                 ]
             ),
-            errored=False,
         )
 
     def test_invalid_choices_sheet_fails(self):
@@ -175,7 +172,6 @@ def test_missing_list_name(self):
                     {"bad_column": "l1", "name": "l1c1", "label": "choice 2"},
                 ]
             ),
-            debug=False,
             errored=True,
             # some basic keywords that should be in the error:
             error__contains=["choices", "name", "list_name"],
diff --git a/tests/test_table_list.py b/tests/test_table_list.py
index ab692055..a6140921 100644
--- a/tests/test_table_list.py
+++ b/tests/test_table_list.py
@@ -41,5 +41,4 @@ def test_table_list(self):
             name="table-list-appearance-mod",
             md=MD,
             xml__contains=[XML_CONTAINS],
-            debug=False,
         )
diff --git a/tests/test_translations.py b/tests/test_translations.py
index 4fff2d48..6afa817c 100644
--- a/tests/test_translations.py
+++ b/tests/test_translations.py
@@ -522,7 +522,6 @@ def test_translation_detection__survey_columns_present_with_media(self):
         """
         self.assertPyxformXform(
             md=md,
-            debug=True,
             xml__xpath_match=[
                 xpq.body_select1_itemset("f"),
                 xpq.body_label_inline("select1", "f", "f"),
diff --git a/tests/test_typed_calculates.py b/tests/test_typed_calculates.py
index 1e3e9ed0..396afef8 100644
--- a/tests/test_typed_calculates.py
+++ b/tests/test_typed_calculates.py
@@ -185,6 +185,5 @@ def test_calculate_without_calculation_with_dynamic_default(self):
         |        | type       | name | label       | calculation | default  |
         |        | calculate  | a    |             |             | random() |
         """,
-            errored=False,
             instance__contains=["<a/>"],
         )
diff --git a/tests/test_unicode_rtl.py b/tests/test_unicode_rtl.py
index fa9de4a7..130b6949 100644
--- a/tests/test_unicode_rtl.py
+++ b/tests/test_unicode_rtl.py
@@ -13,7 +13,6 @@ def test_unicode_snowman(self):
             |        | type | name    | label |
             |        | text | snowman | ☃     |
             """,
-            errored=False,
             xml__contains=["<label>☃</label>"],
         )
 
@@ -49,8 +48,6 @@ def test_smart_quotes(self):
                 ],
                 "settings": [{"version": "q(‘-’)p"}],
             },
-            errored=False,
-            validate=False,
             name="quoth",
             xml__contains=[
                 "'single-quoted",
diff --git a/tests/test_upload_question.py b/tests/test_upload_question.py
index 3440c68e..c6abf6d6 100644
--- a/tests/test_upload_question.py
+++ b/tests/test_upload_question.py
@@ -13,7 +13,6 @@ def test_image_question(self):
             |        | type | name    | label |
             |        | image | photo | Take a photo: |
             """,
-            errored=False,
             xml__contains=[
                 '<bind nodeset="/data/photo" type="binary"/>',
                 '<upload mediatype="image/*" ref="/data/photo">',
@@ -30,7 +29,6 @@ def test_audio_question(self):
             |        | type | name    | label |
             |        | audio | recording1 | Record a sound: |
             """,
-            errored=False,
             xml__contains=[
                 '<bind nodeset="/data/recording1" type="binary"/>',
                 '<upload mediatype="audio/*" ref="/data/recording1">',
@@ -47,7 +45,6 @@ def test_file_question(self):
             |        | type | name    | label |
             |        | file | file1 | Upload a file: |
             """,
-            errored=False,
             xml__contains=[
                 '<bind nodeset="/data/file1" type="binary"/>',
                 '<upload mediatype="application/*" ref="/data/file1">',
@@ -64,7 +61,6 @@ def test_file_question_restrict_filetype(self):
             |        | type | name    | label | body::accept |
             |        | file | upload_a_pdf | Upload a PDF: | application/pdf |
             """,
-            errored=False,
             xml__contains=['<upload accept="application/pdf"'],
         )
 
@@ -78,6 +74,5 @@ def test_image_question_custom_col_calc(self):
             |        | text  | text1            | Text            |                               |
             |        | image | image1           | Take a Photo:   | watermark=${watermark_phrase} |
             """,  # noqa
-            errored=False,
             xml__contains=["watermark= /data/watermark_phrase "],
         )
diff --git a/tests/test_whitespace.py b/tests/test_whitespace.py
index 8b211eb3..4fcfb68c 100644
--- a/tests/test_whitespace.py
+++ b/tests/test_whitespace.py
@@ -29,7 +29,7 @@ def test_values_without_whitespaces_are_processed_successfully(self):
           """
         self.assertPyxformXform(
             md=md,
-            xml__xpath_contains=[
+            xml__xpath_match=[
                 """
                 /h:html/h:head/x:model/x:submission[
                   @action='https://odk.ona.io/random_person/submission'
diff --git a/tests/test_xform2json.py b/tests/test_xform2json.py
index 7d283fb0..48efc070 100644
--- a/tests/test_xform2json.py
+++ b/tests/test_xform2json.py
@@ -30,11 +30,7 @@ def test_convert_toJSON_multi_language(self):
         |         | fruits                 | 3     | Apple      | Pomme    |
         """
 
-        survey = self.md_to_pyxform_survey(
-            md_raw=md,
-            kwargs={"id_string": "id", "name": "multi-language", "title": "some-title"},
-            autoname=False,
-        )
+        survey = self.md_to_pyxform_survey(md_raw=md)
         expected = survey.to_xml()
         generated_json = survey.to_json()
 
diff --git a/tests/test_xls2json.py b/tests/test_xls2json.py
index 00aa9821..4fce5452 100644
--- a/tests/test_xls2json.py
+++ b/tests/test_xls2json.py
@@ -59,7 +59,6 @@ def test_workbook_to_json__case_insensitive__choices(self):
             self.assertPyxformXform(
                 name="test",
                 md=CHOICES.format(name=n),
-                errored=False,
                 warnings_count=0,
             )
 
@@ -70,7 +69,6 @@ def test_workbook_to_json__case_insensitive__external_choices(self):
             self.assertPyxformXform(
                 name="test",
                 md=EXTERNAL_CHOICES.format(name=n),
-                errored=False,
                 warnings_count=0,
             )
 
@@ -81,7 +79,6 @@ def test_workbook_to_json__case_insensitive__settings(self):
             self.assertPyxformXform(
                 name="test",
                 md=SETTINGS.format(name=n),
-                errored=False,
                 warnings_count=0,
             )
 
@@ -92,7 +89,6 @@ def test_workbook_to_json__case_insensitive__survey(self):
             self.assertPyxformXform(
                 name="test",
                 md=SURVEY.format(name=n),
-                errored=False,
                 warnings_count=0,
             )
 
@@ -127,7 +123,6 @@ def test_workbook_to_json__ignore_prefixed_name__settings(self):
             self.assertPyxformXform(
                 name="test",
                 md=SETTINGS.format(name=n),
-                errored=False,
                 warnings_count=0,
             )
 
@@ -173,7 +168,6 @@ def test_workbook_to_json__misspelled_found__choices_exists(self):
             |          | list_name     | name      | label |
             |          | l1            | 1         | C1    |
             """,
-            errored=False,
             warnings_count=0,
         )
 
@@ -234,7 +228,6 @@ def test_workbook_to_json__misspelled_found__external_choices_exists(self):
             |          | l1                     | 1         | 1     |               |
             |          | l1                     | 2         | 2     |               |
             """,
-            errored=False,
             warnings_count=0,
         )
 
@@ -272,7 +265,6 @@ def test_workbook_to_json__misspelled_found__settings(self):
             self.assertPyxformXform(
                 name="test",
                 md=SETTINGS.format(name=n),
-                errored=False,
                 warnings__contains=[self.err_similar_found, "'{}'".format(n)],
             )
 
@@ -291,7 +283,6 @@ def test_workbook_to_json__misspelled_found__settings_exists(self):
             |          | id_string | title     |       |
             |          | my_id     | My Survey |       |
             """,
-            errored=False,
             warnings_count=0,
         )
 
@@ -310,7 +301,6 @@ def test_workbook_to_json__misspelled_found__settings_multiple(self):
             |          | id_string | title     |       |
             |          | my_id     | My Survey |       |
             """,
-            errored=False,
             warnings__contains=[self.err_similar_found, "'setting'", "'stetings'"],
         )
 
@@ -341,7 +331,6 @@ def test_workbook_to_json__misspelled_found__survey_exists(self):
             |         | type      | name      | label |
             |         | text      | q1        | Q1    |
             """,
-            errored=False,
             warnings_count=0,
         )
 
@@ -395,7 +384,6 @@ def test_workbook_to_json__misspelled_not_found__settings(self):
             self.assertPyxformXform(
                 name="test",
                 md=SETTINGS.format(name=n),
-                errored=False,
                 warnings_count=0,
             )
 
@@ -430,7 +418,6 @@ def test_workbook_to_json__multiple_misspellings__all_ok(self):
             |          | id_string     | title     |
             |          | my_id         | My Survey |
             """,
-            errored=False,
             warnings_count=0,
         )
 
@@ -600,7 +587,6 @@ def test_workbook_to_json__optional_sheets_ok(self):
             |          | list_name | name      | label |
             |          | l1        | c1        | One   |
             """,
-            errored=False,
             warnings_count=0,
         )
 
diff --git a/tests/test_xlsform_headers.py b/tests/test_xlsform_headers.py
index e417165f..c588b72a 100644
--- a/tests/test_xlsform_headers.py
+++ b/tests/test_xlsform_headers.py
@@ -36,8 +36,6 @@ def test_calculate_alias(self):
             |        | decimal   | amount  | Counter |               |
             |        | calculate | doubled | Doubled | ${amount} * 2 |
             """,
-            errored=False,
-            debug=False,
         )
 
     def test_form_id_variant(self):
@@ -49,9 +47,9 @@ def test_form_id_variant(self):
 |              | id_string                         | version                | form_id     |
 |              | get_option_from_two_repeat_answer | vWvvk3GYzjXcJQyvTWELej | AUTO-v2-jef |
 """
-        kwargs = {"name": "None", "title": "AUTO-v2-jef", "id_string": "AUTO-v2-jef"}
-
-        survey = self.md_to_pyxform_survey(md, kwargs=kwargs, autoname=False)
+        survey = self.md_to_pyxform_survey(
+            md_raw=md, title="AUTO-v2-jef", id_string="AUTO-v2-jef", autoname=False
+        )
 
         self.assertEqual(survey.id_string, "AUTO-v2-jef")
         self.assertEqual(survey.version, "vWvvk3GYzjXcJQyvTWELej")
diff --git a/tests/test_xlsform_spec.py b/tests/test_xlsform_spec.py
index 713801d7..42e72f28 100644
--- a/tests/test_xlsform_spec.py
+++ b/tests/test_xlsform_spec.py
@@ -56,6 +56,7 @@ def test_warnings__count(self):
         """  # noqa
         warnings = []
         self.assertPyxformXform(
+            debug=True,
             name="spec_test",
             md=md,
             warnings=warnings,
diff --git a/tests/tutorial_test.py b/tests/tutorial_test.py
index 521b6827..eb84cb39 100644
--- a/tests/tutorial_test.py
+++ b/tests/tutorial_test.py
@@ -9,6 +9,7 @@
 
 
 class TutorialTests(TestCase):
-    def test_create_from_path(self):
+    @staticmethod
+    def test_create_from_path():
         path = utils.path_to_text_fixture("tutorial.xls")
         create_survey_from_path(path)
diff --git a/tests/xform_test_case/bug_tests.py b/tests/xform_test_case/bug_tests.py
index 827b4ae7..08bca787 100644
--- a/tests/xform_test_case/bug_tests.py
+++ b/tests/xform_test_case/bug_tests.py
@@ -151,7 +151,8 @@ def runTest(self):
 class ValidateWrapper(unittest.TestCase):
     maxDiff = None
 
-    def runTest(self):
+    @staticmethod
+    def runTest():
         filename = "ODKValidateWarnings.xlsx"
         path_to_excel_file = os.path.join(bug_example_xls.PATH, filename)
         # Get the xform output path: