chg: move test_xlsform_headers.py tests into test_sheet_columns.py

- these test modules are about the same topic

Author: lindsay-stevens

tests/test_sheet_columns.py

@@ -45,6 +45,28 @@ def test_case_insensitive_form_id_form_title(self):
             xml__xpath_match=[xps.form_title("Welcome!"), xps.form_id("My Form")],
         )
 
+    def test_form_id_variant(self):
+        md = """
+        | survey   |      |             |       |
+        |          | type | name        | label |
+        |          | text | member_name | name  |
+        | settings |                                   |                        |             |
+        |          | id_string                         | version                | form_id     |
+        |          | get_option_from_two_repeat_answer | vWvvk3GYzjXcJQyvTWELej | AUTO-v2-jef |
+        """
+        self.assertPyxformXform(
+            md=md,
+            # setting 'id_string' is ignored.
+            xml__xpath_match=[
+                """
+                  /h:html/h:head/x:model/x:instance/x:test_name[
+                    @id='AUTO-v2-jef'
+                    and @version='vWvvk3GYzjXcJQyvTWELej'
+                  ]
+                """
+            ],
+        )
+
 
 class TestSurveyColumns(PyxformTestCase):
     """
@@ -130,7 +152,6 @@ def test_column_case(self):
         Ensure that column name is case insensitive
         """
         self.assertPyxformXform(
-            name="mixedcasecolumns",
             md="""
             | Survey |         |         |               |
             |        | Type    | name    | Label         |
@@ -140,6 +161,40 @@ def test_column_case(self):
             """,
         )
 
+    def test_label_caps_alternatives(self):
+        """
+        re: https://github.com/SEL-Columbia/pyxform/issues/76
+        Capitalization of 'label' column can lead to confusing errors.
+        """
+
+        self.assertPyxformXform(
+            md="""
+            | survey |      |      |       |
+            |        | type | name | label |
+            |        | note | q    | Q     |
+            """,
+            xml__xpath_match=["/h:html/h:body/x:input[./x:label='Q']"],
+        )
+        self.assertPyxformXform(
+            md="""
+            | survey |      |      |       |
+            |        | type | name | Label |
+            |        | note | q    | Q     |
+            """,
+            xml__xpath_match=["/h:html/h:body/x:input[./x:label='Q']"],
+        )
+
+    def test_calculate_alias(self):
+        self.assertPyxformXform(
+            name="calculatealias",
+            md="""
+            | survey |           |         |         |               |
+            |        | type      | name    | label   | calculate     |
+            |        | decimal   | amount  | Counter |               |
+            |        | calculate | doubled | Doubled | ${amount} * 2 |
+            """,
+        )
+
     def test_missing_survey_headers(self):
         self.assertPyxformXform(
             md="""