diff --git a/tests/conftest.py b/tests/conftest.py
index 4b1d9967..15e5905d 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -1,10 +1,15 @@
+"""This module contains fixtures and other helpful functions for the tests."""
+
 import pathlib
 import copy
 import typing
 import itertools
-import os
 import filecmp
+from typing import Optional
+import os
+import shutil
 
+import pypdf
 import jinja2
 import pytest
 import pydantic
@@ -13,11 +18,12 @@ import pydantic_extra_types.phone_numbers as pydantic_phone_numbers
 from rendercv import data_models as dm
 import rendercv.renderer as r
 
+# RenderCV is being tested by comparing the output to reference files. Therefore,
+# reference files should be updated when RenderCV is updated in a way that changes
+# the output. Setting update_testdata to True will update the reference files with
+# the latest RenderCV. This should be done with caution, as it will overwrite the
+# reference files with the latest output.
 update_testdata = False
-folder_name_dictionary = {
-    "rendercv_empty_curriculum_vitae_data_model": "empty",
-    "rendercv_filled_curriculum_vitae_data_model": "filled",
-}
 
 # copy sample entries from docs/generate_entry_figures_and_examples.py:
 education_entry_dictionary = {
@@ -83,46 +89,55 @@ bullet_entry_dictionary = {
 
 @pytest.fixture
 def publication_entry() -> dict[str, str | list[str]]:
+    """Return a sample publication entry."""
     return copy.deepcopy(publication_entry_dictionary)
 
 
 @pytest.fixture
 def experience_entry() -> dict[str, str]:
+    """Return a sample experience entry."""
     return copy.deepcopy(experience_entry_dictionary)
 
 
 @pytest.fixture
 def education_entry() -> dict[str, str]:
+    """Return a sample education entry."""
     return copy.deepcopy(education_entry_dictionary)
 
 
 @pytest.fixture
 def normal_entry() -> dict[str, str]:
+    """Return a sample normal entry."""
     return copy.deepcopy(normal_entry_dictionary)
 
 
 @pytest.fixture
 def one_line_entry() -> dict[str, str]:
+    """Return a sample one line entry."""
     return copy.deepcopy(one_line_entry_dictionary)
 
 
 @pytest.fixture
 def bullet_entry() -> dict[str, str]:
+    """Return a sample bullet entry."""
     return copy.deepcopy(bullet_entry_dictionary)
 
 
 @pytest.fixture
 def text_entry() -> str:
+    """Return a sample text entry."""
     return "My Text Entry with some **markdown** and [links](https://example.com)!"
 
 
 @pytest.fixture
 def rendercv_data_model() -> dm.RenderCVDataModel:
+    """Return a sample RenderCV data model."""
     return dm.get_a_sample_data_model()
 
 
 @pytest.fixture
 def rendercv_empty_curriculum_vitae_data_model() -> dm.CurriculumVitae:
+    """Return an empty CurriculumVitae data model."""
     return dm.CurriculumVitae(sections={"test": ["test"]})
 
 
@@ -130,7 +145,14 @@ def return_a_value_for_a_field_type(
     field: str,
     field_type: typing.Any,
 ) -> str:
-    """Return a value for a field type.
+    """Return a value for a given field and field type.
+
+    Example:
+        ```python
+        return_a_value_for_a_field_type("institution", str)
+        ```
+        will return:
+        `#!python "Boğaziçi University"`
 
     Args:
         field_type (typing.Any): _description_
@@ -230,6 +252,9 @@ def create_combinations_of_a_model(
 def rendercv_filled_curriculum_vitae_data_model(
     text_entry, bullet_entry
 ) -> dm.CurriculumVitae:
+    """Return a filled CurriculumVitae data model, where each section has all possible
+    combinations of entry types.
+    """
     return dm.CurriculumVitae(
         name="John Doe",
         label="Mechanical Engineer",
@@ -259,62 +284,156 @@ def rendercv_filled_curriculum_vitae_data_model(
 
 @pytest.fixture
 def jinja2_environment() -> jinja2.Environment:
+    """Return a Jinja2 environment."""
     return r.setup_jinja2_environment()
 
 
 @pytest.fixture
 def tests_directory_path() -> pathlib.Path:
+    """Return the path to the tests directory."""
     return pathlib.Path(__file__).parent
 
 
 @pytest.fixture
 def root_directory_path(tests_directory_path) -> pathlib.Path:
+    """Return the path to the repository's root directory."""
     return tests_directory_path.parent
 
 
 @pytest.fixture
 def testdata_directory_path(tests_directory_path) -> pathlib.Path:
+    """Return the path to the testdata directory."""
     return tests_directory_path / "testdata"
 
 
 @pytest.fixture
-def run_a_function_and_return_output_and_reference_paths(
+def specific_testdata_directory_path(testdata_directory_path, request) -> pathlib.Path:
+    """Return the path to a specific testdata directory.
+
+    For example, if the test function is named `test_rendercv`, this will return the
+    path to the `testdata/test_rendercv` directory.
+    """
+    return testdata_directory_path / request.node.originalname
+
+
+def are_these_two_directories_the_same(
+    directory1: pathlib.Path, directory2: pathlib.Path
+) -> None:
+    """Check if two directories are the same.
+
+    Args:
+        directory1 (pathlib.Path): The first directory to compare.
+        directory2 (pathlib.Path): The second directory to compare.
+
+    Raises:
+        AssertionError: If the two directories are not the same.
+    """
+    for file1 in directory1.iterdir():
+        file2 = directory2 / file1.name
+        if file1.is_dir():
+            if not file2.is_dir():
+                return False
+            are_these_two_directories_the_same(file1, file2)
+        else:
+            if are_these_two_files_the_same(file1, file2) is False:
+                return False
+
+    return True
+
+
+def are_these_two_files_the_same(file1: pathlib.Path, file2: pathlib.Path) -> None:
+    """Check if two files are the same.
+
+    Args:
+        file1 (pathlib.Path): The first file to compare.
+        file2 (pathlib.Path): The second file to compare.
+
+    Raises:
+        AssertionError: If the two files are not the same.
+    """
+    extension1 = file1.suffix
+    extension2 = file2.suffix
+
+    if extension1 != extension2:
+        return False
+
+    if extension1 == ".pdf":
+        pages1 = pypdf.PdfReader(file1).pages
+        pages2 = pypdf.PdfReader(file2).pages
+        if len(pages1) != len(pages2):
+            return False
+
+        for i in range(len(pages1)):
+            if pages1[i].extract_text() != pages2[i].extract_text():
+                return False
+
+        return True
+    else:
+        return filecmp.cmp(file1, file2)
+
+
+@pytest.fixture
+def run_a_function_and_check_if_output_is_the_same_as_reference(
     tmp_path: pathlib.Path,
-    testdata_directory_path: pathlib.Path,
-    request: pytest.FixtureRequest,
+    specific_testdata_directory_path: pathlib.Path,
 ) -> typing.Callable:
+    """Run a function and check if the output is the same as the reference."""
+
     def function(
         function: typing.Callable,
-        file_name: str,
+        reference_file_or_directory_name: str,
+        output_file_name: Optional[str] = None,
+        generate_reference_files_function: Optional[typing.Callable] = None,
         **kwargs,
     ):
-        reference_directory_path = (
-            testdata_directory_path / request.node.name / file_name
+        output_is_a_single_file = output_file_name is not None
+        if output_is_a_single_file:
+            output_file_path = tmp_path / output_file_name
+
+        reference_directory_path: pathlib.Path = specific_testdata_directory_path
+        reference_file_or_directory_path = (
+            reference_directory_path / reference_file_or_directory_name
         )
-        reference_file_path = reference_directory_path / file_name
-        output_file_path = tmp_path / file_name
 
-        os.chdir(tmp_path)
-
-        function(**kwargs)
-
-        # Update the auxiliary files if update_testdata is True
+        # Update the testdata if update_testdata is True
         if update_testdata:
             # create the reference directory if it does not exist
             reference_directory_path.mkdir(parents=True, exist_ok=True)
 
-            # remove the reference file if it exists
-            if reference_file_path.exists():
-                reference_file_path.unlink()
+            # remove the reference file or directory if it exists
+            if reference_file_or_directory_path.is_dir():
+                shutil.rmtree(reference_file_or_directory_path)
+            elif reference_file_or_directory_path.exists():
+                reference_file_or_directory_path.unlink()
 
-            # copy the output file to the reference directory
-            output_file_path.copy(reference_file_path)
+            if generate_reference_files_function:
+                generate_reference_files_function(
+                    reference_file_or_directory_path, **kwargs
+                )
+            else:
+                # copy the output file or directory to the reference directory
+                function(tmp_path, reference_file_or_directory_path, **kwargs)
+                if output_is_a_single_file:
+                    shutil.move(output_file_path, reference_file_or_directory_path)
+                else:
+                    shutil.move(tmp_path, reference_file_or_directory_path)
+                    os.mkdir(tmp_path)
 
-        assert filecmp.cmp(output_file_path, reference_file_path)
+        function(tmp_path, reference_file_or_directory_path, **kwargs)
+
+        if output_is_a_single_file:
+            return are_these_two_files_the_same(
+                output_file_path, reference_file_or_directory_path
+            )
+        else:
+            return are_these_two_directories_the_same(
+                tmp_path, reference_file_or_directory_path
+            )
 
     return function
 
 
 @pytest.fixture
 def input_file_path(testdata_directory_path) -> pathlib.Path:
+    """Return the path to the input file."""
     return testdata_directory_path / "John_Doe_CV.yaml"
diff --git a/tests/test_data_models.py b/tests/test_data_models.py
index f67f79b0..c8d86eaa 100644
--- a/tests/test_data_models.py
+++ b/tests/test_data_models.py
@@ -62,6 +62,10 @@ def test_format_date(date, expected_date_string):
 def test_read_input_file(input_file_path):
     # Update the auxiliary files if update_testdata is True
     if update_testdata:
+        # create testdata directory if it doesn't exist
+        if not input_file_path.parent.exists():
+            input_file_path.parent.mkdir()
+
         input_dictionary = {
             "cv": {
                 "name": "John Doe",
diff --git a/tests/test_renderer.py b/tests/test_renderer.py
index b8d8c73c..84825a72 100644
--- a/tests/test_renderer.py
+++ b/tests/test_renderer.py
@@ -1,21 +1,19 @@
 import math
-import filecmp
 import shutil
-import os
 import copy
 import pathlib
 
 import pytest
 import jinja2
 import time_machine
-import pypdf
 
 from rendercv import renderer as r
 from rendercv import data_models as dm
 
-from .conftest import update_testdata, folder_name_dictionary
-
-
+folder_name_dictionary = {
+    "rendercv_empty_curriculum_vitae_data_model": "empty",
+    "rendercv_filled_curriculum_vitae_data_model": "filled",
+}
 
 
 def test_latex_file_class(tmp_path, rendercv_data_model, jinja2_environment):
@@ -305,34 +303,30 @@ def test_setup_jinja2_environment():
 )
 @time_machine.travel("2024-01-01")
 def test_generate_latex_file(
-    tmp_path,
-    testdata_directory_path,
+    run_a_function_and_check_if_output_is_the_same_as_reference,
     request: pytest.FixtureRequest,
     theme_name,
     curriculum_vitae_data_model,
 ):
-    reference_directory_path = (
-        testdata_directory_path
-        / "test_generate_latex_file"
-        / f"{theme_name}_{folder_name_dictionary[curriculum_vitae_data_model]}"
-    )
-
     cv_data_model = request.getfixturevalue(curriculum_vitae_data_model)
-
-    file_name = f"{str(cv_data_model.name).replace(' ', '_')}_CV.tex"
-    output_file_path = tmp_path / "make_sure_it_generates_the_directory" / file_name
-    reference_file_path = reference_directory_path / file_name
-
     data_model = dm.RenderCVDataModel(
         cv=cv_data_model,
         design={"theme": theme_name},
     )
-    r.generate_latex_file(data_model, tmp_path / "make_sure_it_generates_the_directory")
-    # Update the auxiliary files if update_testdata is True
-    if update_testdata:
-        r.generate_latex_file(data_model, reference_directory_path)
 
-    assert filecmp.cmp(output_file_path, reference_file_path)
+    output_file_name = f"{str(cv_data_model.name).replace(' ', '_')}_CV.tex"
+    reference_file_name = (
+        f"{theme_name}_{folder_name_dictionary[curriculum_vitae_data_model]}.tex"
+    )
+
+    def generate_latex_file(output_directory_path, reference_file_or_directory_path):
+        r.generate_latex_file(data_model, output_directory_path)
+
+    assert run_a_function_and_check_if_output_is_the_same_as_reference(
+        generate_latex_file,
+        reference_file_name,
+        output_file_name,
+    )
 
 
 @pytest.mark.parametrize(
@@ -348,35 +342,30 @@ def test_generate_latex_file(
 )
 @time_machine.travel("2024-01-01")
 def test_generate_markdown_file(
-    tmp_path,
-    testdata_directory_path,
+    run_a_function_and_check_if_output_is_the_same_as_reference,
     request: pytest.FixtureRequest,
     theme_name,
     curriculum_vitae_data_model,
 ):
-    reference_directory_path = (
-        testdata_directory_path
-        / "test_generate_markdown_file"
-        / f"{theme_name}_{folder_name_dictionary[curriculum_vitae_data_model]}"
-    )
-
     cv_data_model = request.getfixturevalue(curriculum_vitae_data_model)
-
-    file_name = f"{str(cv_data_model.name).replace(' ', '_')}_CV.md"
-    output_file_path = tmp_path / "make_sure_it_generates_the_directory" / file_name
-    reference_file_path = reference_directory_path / file_name
-
     data_model = dm.RenderCVDataModel(
         cv=cv_data_model,
+        design={"theme": theme_name},
     )
-    r.generate_markdown_file(
-        data_model, tmp_path / "make_sure_it_generates_the_directory"
-    )
-    # Update the auxiliary files if update_testdata is True
-    if update_testdata:
-        r.generate_markdown_file(data_model, reference_directory_path)
 
-    assert filecmp.cmp(output_file_path, reference_file_path)
+    output_file_name = f"{str(cv_data_model.name).replace(' ', '_')}_CV.md"
+    reference_file_name = (
+        f"{theme_name}_{folder_name_dictionary[curriculum_vitae_data_model]}.md"
+    )
+
+    def generate_markdown_file(output_directory_path, reference_file_or_directory_path):
+        r.generate_markdown_file(data_model, output_directory_path)
+
+    assert run_a_function_and_check_if_output_is_the_same_as_reference(
+        generate_markdown_file,
+        reference_file_name,
+        output_file_name,
+    )
 
 
 @pytest.mark.parametrize(
@@ -384,60 +373,49 @@ def test_generate_markdown_file(
     dm.available_themes,
 )
 def test_copy_theme_files_to_output_directory(
-    tmp_path, testdata_directory_path, theme_name
+    run_a_function_and_check_if_output_is_the_same_as_reference, theme_name
 ):
-    reference_directory_path = (
-        testdata_directory_path / "test_copy_theme_files_to_output_directory"
+    reference_directory_name = theme_name
+
+    def copy_theme_files_to_output_directory(
+        output_directory_path, reference_file_or_directory_path
+    ):
+        r.copy_theme_files_to_output_directory(theme_name, output_directory_path)
+
+    assert run_a_function_and_check_if_output_is_the_same_as_reference(
+        copy_theme_files_to_output_directory,
+        reference_directory_name,
     )
 
-    r.copy_theme_files_to_output_directory(theme_name, tmp_path)
-    # Update the auxiliary files if update_testdata is True
-    if update_testdata:
-        reference_directory_path.mkdir(parents=True, exist_ok=True)
-        r.copy_theme_files_to_output_directory(theme_name, reference_directory_path)
-
-    assert filecmp.dircmp(tmp_path, reference_directory_path).diff_files == []
-
 
 def test_copy_theme_files_to_output_directory_custom_theme(
-    tmp_path, testdata_directory_path
+    run_a_function_and_check_if_output_is_the_same_as_reference,
 ):
     theme_name = "dummytheme"
-
-    test_testdata_directory_path = (
-        testdata_directory_path
-        / "test_copy_theme_files_to_output_directory_custom_theme"
-    )
-    custom_theme_directory_path = test_testdata_directory_path / "dummytheme"
-    reference_directory_path = (
-        test_testdata_directory_path / "theme_auxiliary_files"
-    )
+    reference_directory_name = f"{theme_name}_auxiliary_files"
 
     # Update the auxiliary files if update_testdata is True
-    if update_testdata:
+    def update_reference_files(reference_directory_path):
+        dummytheme_path = reference_directory_path.parent / theme_name
+
         # create dummytheme:
-        if not custom_theme_directory_path.exists():
-            custom_theme_directory_path.mkdir(parents=True, exist_ok=True)
+        if not dummytheme_path.exists():
+            dummytheme_path.mkdir(parents=True, exist_ok=True)
 
         # create a txt file called test.txt in the custom theme directory:
         for entry_type_name in dm.entry_type_names:
-            pathlib.Path(
-                custom_theme_directory_path / f"{entry_type_name}.j2.tex"
-            ).touch()
-        pathlib.Path(custom_theme_directory_path / "Header.j2.tex").touch()
-        pathlib.Path(custom_theme_directory_path / "Preamble.j2.tex").touch()
-        pathlib.Path(custom_theme_directory_path / "SectionBeginning.j2.tex").touch()
-        pathlib.Path(custom_theme_directory_path / "SectionEnding.j2.tex").touch()
-        pathlib.Path(custom_theme_directory_path / "theme_auxiliary_file.cls").touch()
-        pathlib.Path(custom_theme_directory_path / "theme_auxiliary_dir").mkdir(
-            exist_ok=True
-        )
+            pathlib.Path(dummytheme_path / f"{entry_type_name}.j2.tex").touch()
+
+        pathlib.Path(dummytheme_path / "Header.j2.tex").touch()
+        pathlib.Path(dummytheme_path / "Preamble.j2.tex").touch()
+        pathlib.Path(dummytheme_path / "SectionBeginning.j2.tex").touch()
+        pathlib.Path(dummytheme_path / "SectionEnding.j2.tex").touch()
+        pathlib.Path(dummytheme_path / "theme_auxiliary_file.cls").touch()
+        pathlib.Path(dummytheme_path / "theme_auxiliary_dir").mkdir(exist_ok=True)
         pathlib.Path(
-            custom_theme_directory_path
-            / "theme_auxiliary_dir"
-            / "theme_auxiliary_file.txt"
+            dummytheme_path / "theme_auxiliary_dir" / "theme_auxiliary_file.txt"
         ).touch()
-        init_file = pathlib.Path(custom_theme_directory_path / "__init__.py")
+        init_file = pathlib.Path(dummytheme_path / "__init__.py")
 
         init_file.touch()
         init_file.write_text(
@@ -447,17 +425,29 @@ def test_copy_theme_files_to_output_directory_custom_theme(
         )
 
         # create reference_directory_path:
-        os.chdir(test_testdata_directory_path)
-        r.copy_theme_files_to_output_directory(theme_name, reference_directory_path)
+        r.copy_theme_files_to_output_directory(
+            theme_name=theme_name,
+            output_directory_path=reference_directory_path,
+            theme_directory_path=dummytheme_path,
+        )
 
-    # change current working directory to the test_testdata_directory_path
-    os.chdir(test_testdata_directory_path)
+    def copy_theme_files_to_output_directory(
+        output_directory_path, reference_directory_path
+    ):
+        dummytheme_path = reference_directory_path.parent / theme_name
 
-    # copy the auxiliary theme files to tmp_path:
-    r.copy_theme_files_to_output_directory(theme_name, tmp_path)
+        # copy the auxiliary theme files to tmp_path:
+        r.copy_theme_files_to_output_directory(
+            theme_name=theme_name,
+            output_directory_path=output_directory_path,
+            theme_directory_path=dummytheme_path,
+        )
 
-    assert filecmp.dircmp(tmp_path, reference_directory_path).left_only == []
-    assert filecmp.dircmp(tmp_path, reference_directory_path).right_only == []
+    assert run_a_function_and_check_if_output_is_the_same_as_reference(
+        function=copy_theme_files_to_output_directory,
+        reference_file_or_directory_name=reference_directory_name,
+        generate_reference_files_function=update_reference_files,
+    )
 
 
 @pytest.mark.parametrize(
@@ -473,29 +463,29 @@ def test_copy_theme_files_to_output_directory_custom_theme(
 )
 @time_machine.travel("2024-01-01")
 def test_generate_latex_file_and_copy_theme_files(
-    tmp_path,
-    testdata_directory_path,
-    request : pytest.FixtureRequest,
+    run_a_function_and_check_if_output_is_the_same_as_reference,
+    request: pytest.FixtureRequest,
     theme_name,
     curriculum_vitae_data_model,
 ):
-    reference_directory_path = (
-        testdata_directory_path
-        / "test_generate_latex_file_and_copy_theme_files"
-        / f"{theme_name}_{folder_name_dictionary[curriculum_vitae_data_model]}"
+    reference_directory_name = (
+        f"{theme_name}_{folder_name_dictionary[curriculum_vitae_data_model]}"
     )
 
     data_model = dm.RenderCVDataModel(
         cv=request.getfixturevalue(curriculum_vitae_data_model),
         design={"theme": theme_name},
     )
-    r.generate_latex_file_and_copy_theme_files(data_model, tmp_path)
-    # Update the auxiliary files if update_testdata is True
-    if update_testdata:
-        r.generate_latex_file_and_copy_theme_files(data_model, reference_directory_path)
 
-    assert filecmp.dircmp(tmp_path, reference_directory_path).left_only == []
-    assert filecmp.dircmp(tmp_path, reference_directory_path).right_only == []
+    def generate_latex_file_and_copy_theme_files(
+        output_directory_path, reference_file_or_directory_path
+    ):
+        r.generate_latex_file_and_copy_theme_files(data_model, output_directory_path)
+
+    assert run_a_function_and_check_if_output_is_the_same_as_reference(
+        generate_latex_file_and_copy_theme_files,
+        reference_directory_name,
+    )
 
 
 @pytest.mark.parametrize(
@@ -511,53 +501,38 @@ def test_generate_latex_file_and_copy_theme_files(
 )
 @time_machine.travel("2024-01-01")
 def test_latex_to_pdf(
-    tmp_path,
     request: pytest.FixtureRequest,
-    testdata_directory_path,
+    run_a_function_and_check_if_output_is_the_same_as_reference,
     theme_name,
     curriculum_vitae_data_model,
 ):
-    latex_sources_path = (
-        testdata_directory_path
-        / "test_generate_latex_file_and_copy_theme_files"
-        / f"{theme_name}_{folder_name_dictionary[curriculum_vitae_data_model]}"
-    )
-    reference_directory_path = (
-        testdata_directory_path
-        / "test_latex_to_pdf"
-        / f"{theme_name}_{folder_name_dictionary[curriculum_vitae_data_model]}"
-    )
+    name = request.getfixturevalue(curriculum_vitae_data_model).name
+    name = str(name).replace(" ", "_")
 
-    cv_data_model = request.getfixturevalue(curriculum_vitae_data_model)
-    file_name_stem = f"{str(cv_data_model.name).replace(' ', '_')}_CV"
+    output_file_name = f"{name}_CV.pdf"
+    reference_name = (
+        f"{theme_name}_{folder_name_dictionary[curriculum_vitae_data_model]}"
+    )
+    reference_file_name = f"{reference_name}.pdf"
 
-    # Update the auxiliary files if update_testdata is True
-    if update_testdata:
-        # copy the latex sources to the reference_directory_path
-        shutil.copytree(
-            latex_sources_path, reference_directory_path, dirs_exist_ok=True
+    def generate_pdf_file(output_directory_path, reference_file_or_directory_path):
+        latex_sources_path = (
+            reference_file_or_directory_path.parent.parent
+            / "test_generate_latex_file_and_copy_theme_files"
+            / reference_name
         )
 
+        # copy the latex sources to the output path
+        shutil.copytree(latex_sources_path, output_directory_path, dirs_exist_ok=True)
+
         # convert the latex code to a pdf
-        reference_pdf_file_path = r.latex_to_pdf(
-            reference_directory_path / f"{file_name_stem}.tex"
-        )
+        r.latex_to_pdf(output_directory_path / f"{name}_CV.tex")
 
-        # remove the latex sources from the reference_directory_path, but keep the pdf
-        for file in reference_directory_path.iterdir():
-            if file.is_file() and file.suffix != ".pdf":
-                file.unlink()
-
-    # copy the latex sources to the tmp_path
-    shutil.copytree(latex_sources_path, tmp_path, dirs_exist_ok=True)
-
-    # convert the latex code to a pdf
-    reference_pdf_file_path = reference_directory_path / f"{file_name_stem}.pdf"
-    output_file_path = r.latex_to_pdf(tmp_path / f"{file_name_stem}.tex")
-
-    text1 = pypdf.PdfReader(output_file_path).pages[0].extract_text()
-    text2 = pypdf.PdfReader(reference_pdf_file_path).pages[0].extract_text()
-    assert text1 == text2
+    assert run_a_function_and_check_if_output_is_the_same_as_reference(
+        function=generate_pdf_file,
+        reference_file_or_directory_name=reference_file_name,
+        output_file_name=output_file_name,
+    )
 
 
 def test_latex_to_pdf_invalid_latex_file():
@@ -579,50 +554,37 @@ def test_latex_to_pdf_invalid_latex_file():
 )
 @time_machine.travel("2024-01-01")
 def test_markdown_to_html(
-    tmp_path,
-    request: pytest.FixtureRequest,
-    testdata_directory_path,
+    run_a_function_and_check_if_output_is_the_same_as_reference,
     theme_name,
     curriculum_vitae_data_model,
 ):
-    markdown_sources_path = (
-        testdata_directory_path
-        / "test_generate_markdown_file"
-        / f"{theme_name}_{folder_name_dictionary[curriculum_vitae_data_model]}"
+    reference_name = (
+        f"{theme_name}_{folder_name_dictionary[curriculum_vitae_data_model]}"
     )
-    reference_directory = (
-        testdata_directory_path
-        / "test_markdown_to_html"
-        / f"{theme_name}_{folder_name_dictionary[curriculum_vitae_data_model]}"
+    output_file_name = f"{reference_name}_PASTETOGRAMMARLY.html"
+    reference_file_name = f"{reference_name}.html"
+
+    def markdown_to_html(output_directory_path, reference_file_or_directory_path):
+        markdown_file_name = f"{reference_name}.md"
+
+        markdown_source_path = (
+            reference_file_or_directory_path.parent.parent
+            / "test_generate_markdown_file"
+            / markdown_file_name
+        )
+
+        # copy the latex source to the output path
+        shutil.copy(markdown_source_path, output_directory_path)
+
+        # convert the latex code to a md
+        r.markdown_to_html(output_directory_path / markdown_file_name)
+
+    assert run_a_function_and_check_if_output_is_the_same_as_reference(
+        function=markdown_to_html,
+        reference_file_or_directory_name=reference_file_name,
+        output_file_name=output_file_name,
     )
 
-    cv_data_model = request.getfixturevalue(curriculum_vitae_data_model)
-    file_name_stem = f"{str(cv_data_model.name).replace(' ', '_')}_CV"
-
-    # Update the auxiliary files if update_testdata is True
-    if update_testdata:
-        # copy the markdown sources to the reference_directory
-        shutil.copytree(markdown_sources_path, reference_directory, dirs_exist_ok=True)
-
-        # convert markdown to html
-        r.markdown_to_html(reference_directory / f"{file_name_stem}.md")
-
-        # remove the markdown sources from the reference_directory
-        for file in reference_directory.iterdir():
-            if file.is_file() and file.suffix != ".html":
-                file.unlink()
-
-    # copy the markdown sources to the tmp_path
-    shutil.copytree(markdown_sources_path, tmp_path, dirs_exist_ok=True)
-
-    # convert markdown to html
-    output_file_path = r.markdown_to_html(tmp_path / f"{file_name_stem}.md")
-    reference_file_path = (
-        reference_directory / f"{file_name_stem}_PASTETOGRAMMARLY.html"
-    )
-
-    assert filecmp.cmp(output_file_path, reference_file_path)
-
 
 def test_markdown_to_html_invalid_markdown_file():
     with pytest.raises(FileNotFoundError):
diff --git a/tests/testdata/test_copy_theme_files_to_output_directory/LICENSE b/tests/testdata/test_copy_theme_files_to_output_directory/sb2nov/LICENSE
similarity index 100%
rename from tests/testdata/test_copy_theme_files_to_output_directory/LICENSE
rename to tests/testdata/test_copy_theme_files_to_output_directory/sb2nov/LICENSE
diff --git a/tests/testdata/test_copy_theme_files_to_output_directory_custom_theme/theme_auxiliary_files/theme_auxiliary_dir/theme_auxiliary_file.txt b/tests/testdata/test_copy_theme_files_to_output_directory_custom_theme/dummytheme_auxiliary_files/theme_auxiliary_dir/theme_auxiliary_file.txt
similarity index 100%
rename from tests/testdata/test_copy_theme_files_to_output_directory_custom_theme/theme_auxiliary_files/theme_auxiliary_dir/theme_auxiliary_file.txt
rename to tests/testdata/test_copy_theme_files_to_output_directory_custom_theme/dummytheme_auxiliary_files/theme_auxiliary_dir/theme_auxiliary_file.txt
diff --git a/tests/testdata/test_copy_theme_files_to_output_directory_custom_theme/theme_auxiliary_files/theme_auxiliary_file.cls b/tests/testdata/test_copy_theme_files_to_output_directory_custom_theme/dummytheme_auxiliary_files/theme_auxiliary_file.cls
similarity index 100%
rename from tests/testdata/test_copy_theme_files_to_output_directory_custom_theme/theme_auxiliary_files/theme_auxiliary_file.cls
rename to tests/testdata/test_copy_theme_files_to_output_directory_custom_theme/dummytheme_auxiliary_files/theme_auxiliary_file.cls
diff --git a/tests/testdata/test_generate_latex_file/classic_empty/None_CV.tex b/tests/testdata/test_generate_latex_file/classic_empty.tex
similarity index 100%
rename from tests/testdata/test_generate_latex_file/classic_empty/None_CV.tex
rename to tests/testdata/test_generate_latex_file/classic_empty.tex
diff --git a/tests/testdata/test_generate_latex_file/classic_filled/John_Doe_CV.tex b/tests/testdata/test_generate_latex_file/classic_filled.tex
similarity index 99%
rename from tests/testdata/test_generate_latex_file/classic_filled/John_Doe_CV.tex
rename to tests/testdata/test_generate_latex_file/classic_filled.tex
index 42d31d4e..51501434 100644
--- a/tests/testdata/test_generate_latex_file/classic_filled/John_Doe_CV.tex
+++ b/tests/testdata/test_generate_latex_file/classic_filled.tex
@@ -268,6 +268,23 @@
             
 
             
+        \end{tabularx}
+
+        \vspace{0.2 cm}
+        \begin{tabularx}{
+            \textwidth-0.4 cm-0.13cm
+        }{
+            K{0.2 cm}
+            R{4.1 cm}
+        }
+            \textbf{Some Company}, Software Engineer
+
+            \vspace{0.10 cm}
+
+            &
+            Istanbul, Turkey
+
+            
         \end{tabularx}
 
         \vspace{0.2 cm}
@@ -356,6 +373,61 @@
             &
             Istanbul, Turkey
 
+            Sept. 2015 to present
+        \end{tabularx}
+
+        \vspace{0.2 cm}
+        \begin{tabularx}{
+            \textwidth-0.4 cm-0.13cm
+        }{
+            K{0.2 cm}
+            R{4.1 cm}
+        }
+            \textbf{Some Company}, Software Engineer
+
+            \vspace{0.10 cm}
+
+            &
+            Istanbul, Turkey
+
+            Jan. 2024
+        \end{tabularx}
+
+        \vspace{0.2 cm}
+        \begin{tabularx}{
+            \textwidth-0.4 cm-0.13cm
+        }{
+            K{0.2 cm}
+            R{4.1 cm}
+        }
+            \textbf{Some Company}, Software Engineer
+
+            \vspace{0.10 cm}
+
+            &
+            Istanbul, Turkey
+
+            Sept. 2021
+        \end{tabularx}
+
+        \vspace{0.2 cm}
+        \begin{tabularx}{
+            \textwidth-0.4 cm-0.13cm
+        }{
+            K{0.2 cm}
+            R{4.1 cm}
+        }
+            \textbf{Some Company}, Software Engineer
+
+            \vspace{0.10 cm}
+
+            \begin{highlights}
+                \item Did this.
+                \item Did that.
+            \end{highlights}
+            &
+            Istanbul, Turkey
+
             
         \end{tabularx}
 
@@ -414,23 +486,6 @@
             Sept. 2015 to present
         \end{tabularx}
 
-        \vspace{0.2 cm}
-        \begin{tabularx}{
-            \textwidth-0.4 cm-0.13cm
-        }{
-            K{0.2 cm}
-            R{4.1 cm}
-        }
-            \textbf{Some Company}, Software Engineer
-
-            \vspace{0.10 cm}
-
-            &
-            Istanbul, Turkey
-
-            Sept. 2015 to present
-        \end{tabularx}
-
         \vspace{0.2 cm}
         \begin{tabularx}{
             \textwidth-0.4 cm-0.13cm
@@ -469,23 +524,6 @@
             Jan. 2024
         \end{tabularx}
 
-        \vspace{0.2 cm}
-        \begin{tabularx}{
-            \textwidth-0.4 cm-0.13cm
-        }{
-            K{0.2 cm}
-            R{4.1 cm}
-        }
-            \textbf{Some Company}, Software Engineer
-
-            \vspace{0.10 cm}
-
-            &
-            Istanbul, Turkey
-
-            Jan. 2024
-        \end{tabularx}
-
         \vspace{0.2 cm}
         \begin{tabularx}{
             \textwidth-0.4 cm-0.13cm
@@ -507,82 +545,6 @@
             Sept. 2021
         \end{tabularx}
 
-        \vspace{0.2 cm}
-        \begin{tabularx}{
-            \textwidth-0.4 cm-0.13cm
-        }{
-            K{0.2 cm}
-            R{4.1 cm}
-        }
-            \textbf{Some Company}, Software Engineer
-
-            \vspace{0.10 cm}
-
-            &
-            Istanbul, Turkey
-
-            Sept. 2021
-        \end{tabularx}
-
-        \vspace{0.2 cm}
-        \begin{tabularx}{
-            \textwidth-0.4 cm-0.13cm
-        }{
-            K{0.2 cm}
-            R{4.1 cm}
-        }
-            \textbf{Some Company}, Software Engineer
-
-            \vspace{0.10 cm}
-
-            \begin{highlights}
-                \item Did this.
-                \item Did that.
-            \end{highlights}
-            &
-            Istanbul, Turkey
-
-            
-        \end{tabularx}
-
-        \vspace{0.2 cm}
-        \begin{tabularx}{
-            \textwidth-0.4 cm-0.13cm
-        }{
-            K{0.2 cm}
-            R{4.1 cm}
-        }
-            \textbf{Some Company}, Software Engineer
-
-            \vspace{0.10 cm}
-
-            &
-            
-
-            Sept. 2021
-        \end{tabularx}
-
-        \vspace{0.2 cm}
-        \begin{tabularx}{
-            \textwidth-0.4 cm-0.13cm
-        }{
-            K{0.2 cm}
-            R{4.1 cm}
-        }
-            \textbf{Some Company}, Software Engineer
-
-            \vspace{0.10 cm}
-
-            \begin{highlights}
-                \item Did this.
-                \item Did that.
-            \end{highlights}
-            &
-            
-
-            Sept. 2015 to present
-        \end{tabularx}
-
         \vspace{0.2 cm}
         \begin{tabularx}{
             \textwidth-0.4 cm-0.13cm
@@ -600,27 +562,6 @@
             Sept. 2015 to present
         \end{tabularx}
 
-        \vspace{0.2 cm}
-        \begin{tabularx}{
-            \textwidth-0.4 cm-0.13cm
-        }{
-            K{0.2 cm}
-            R{4.1 cm}
-        }
-            \textbf{Some Company}, Software Engineer
-
-            \vspace{0.10 cm}
-
-            \begin{highlights}
-                \item Did this.
-                \item Did that.
-            \end{highlights}
-            &
-            
-
-            Sept. 2021
-        \end{tabularx}
-
         \vspace{0.2 cm}
         \begin{tabularx}{
             \textwidth-0.4 cm-0.13cm
@@ -659,27 +600,6 @@
             Sept. 2015 to present
         \end{tabularx}
 
-        \vspace{0.2 cm}
-        \begin{tabularx}{
-            \textwidth-0.4 cm-0.13cm
-        }{
-            K{0.2 cm}
-            R{4.1 cm}
-        }
-            \textbf{Some Company}, Software Engineer
-
-            \vspace{0.10 cm}
-
-            \begin{highlights}
-                \item Did this.
-                \item Did that.
-            \end{highlights}
-            &
-            
-
-            Sept. 2021
-        \end{tabularx}
-
         \vspace{0.2 cm}
         \begin{tabularx}{
             \textwidth-0.4 cm-0.13cm
@@ -739,6 +659,65 @@
             Sept. 2021
         \end{tabularx}
 
+        \vspace{0.2 cm}
+        \begin{tabularx}{
+            \textwidth-0.4 cm-0.13cm
+        }{
+            K{0.2 cm}
+            R{4.1 cm}
+        }
+            \textbf{Some Company}, Software Engineer
+
+            \vspace{0.10 cm}
+
+            &
+            
+
+            Sept. 2021
+        \end{tabularx}
+
+        \vspace{0.2 cm}
+        \begin{tabularx}{
+            \textwidth-0.4 cm-0.13cm
+        }{
+            K{0.2 cm}
+            R{4.1 cm}
+        }
+            \textbf{Some Company}, Software Engineer
+
+            \vspace{0.10 cm}
+
+            \begin{highlights}
+                \item Did this.
+                \item Did that.
+            \end{highlights}
+            &
+            
+
+            Sept. 2015 to present
+        \end{tabularx}
+
+        \vspace{0.2 cm}
+        \begin{tabularx}{
+            \textwidth-0.4 cm-0.13cm
+        }{
+            K{0.2 cm}
+            R{4.1 cm}
+        }
+            \textbf{Some Company}, Software Engineer
+
+            \vspace{0.10 cm}
+
+            \begin{highlights}
+                \item Did this.
+                \item Did that.
+            \end{highlights}
+            &
+            
+
+            Sept. 2021
+        \end{tabularx}
+
         \vspace{0.2 cm}
         \begin{tabularx}{
             \textwidth-0.4 cm-0.13cm
@@ -840,6 +819,27 @@
             Sept. 2021
         \end{tabularx}
 
+        \vspace{0.2 cm}
+        \begin{tabularx}{
+            \textwidth-0.4 cm-0.13cm
+        }{
+            K{0.2 cm}
+            R{4.1 cm}
+        }
+            \textbf{Some Company}, Software Engineer
+
+            \vspace{0.10 cm}
+
+            \begin{highlights}
+                \item Did this.
+                \item Did that.
+            \end{highlights}
+            &
+            
+
+            Sept. 2021
+        \end{tabularx}
+
         \vspace{0.2 cm}
         \begin{tabularx}{
             \textwidth-0.4 cm-0.13cm
@@ -882,6 +882,26 @@
             
 
             
+        \end{tabularx}
+
+        \vspace{0.2 cm}
+        \begin{tabularx}{
+            \textwidth-0.4 cm-0.13cm
+        }{
+            L{0.85cm}
+            K{0.2 cm}
+            R{4.1 cm}
+        }
+            \textbf{}
+            &
+            \textbf{Boğaziçi University}, Mechanical Engineering
+
+            \vspace{0.10 cm}
+
+            &
+            Istanbul, Turkey
+
+            
         \end{tabularx}
 
         \vspace{0.2 cm}
@@ -966,6 +986,26 @@
             
 
             
+        \end{tabularx}
+
+        \vspace{0.2 cm}
+        \begin{tabularx}{
+            \textwidth-0.4 cm-0.13cm
+        }{
+            L{0.85cm}
+            K{0.2 cm}
+            R{4.1 cm}
+        }
+            \textbf{BS}
+            &
+            \textbf{Boğaziçi University}, Mechanical Engineering
+
+            \vspace{0.10 cm}
+
+            &
+            
+
+            
         \end{tabularx}
 
         \vspace{0.2 cm}
@@ -985,6 +1025,70 @@
             &
             Istanbul, Turkey
 
+            Sept. 2015 to present
+        \end{tabularx}
+
+        \vspace{0.2 cm}
+        \begin{tabularx}{
+            \textwidth-0.4 cm-0.13cm
+        }{
+            L{0.85cm}
+            K{0.2 cm}
+            R{4.1 cm}
+        }
+            \textbf{}
+            &
+            \textbf{Boğaziçi University}, Mechanical Engineering
+
+            \vspace{0.10 cm}
+
+            &
+            Istanbul, Turkey
+
+            Jan. 2024
+        \end{tabularx}
+
+        \vspace{0.2 cm}
+        \begin{tabularx}{
+            \textwidth-0.4 cm-0.13cm
+        }{
+            L{0.85cm}
+            K{0.2 cm}
+            R{4.1 cm}
+        }
+            \textbf{}
+            &
+            \textbf{Boğaziçi University}, Mechanical Engineering
+
+            \vspace{0.10 cm}
+
+            &
+            Istanbul, Turkey
+
+            Sept. 2021
+        \end{tabularx}
+
+        \vspace{0.2 cm}
+        \begin{tabularx}{
+            \textwidth-0.4 cm-0.13cm
+        }{
+            L{0.85cm}
+            K{0.2 cm}
+            R{4.1 cm}
+        }
+            \textbf{}
+            &
+            \textbf{Boğaziçi University}, Mechanical Engineering
+
+            \vspace{0.10 cm}
+
+            \begin{highlights}
+                \item Did this.
+                \item Did that.
+            \end{highlights}
+            &
+            Istanbul, Turkey
+
             
         \end{tabularx}
 
@@ -1003,7 +1107,7 @@
             \vspace{0.10 cm}
 
             &
-            
+            Istanbul, Turkey
 
             
         \end{tabularx}
@@ -1072,26 +1176,6 @@
             Sept. 2015 to present
         \end{tabularx}
 
-        \vspace{0.2 cm}
-        \begin{tabularx}{
-            \textwidth-0.4 cm-0.13cm
-        }{
-            L{0.85cm}
-            K{0.2 cm}
-            R{4.1 cm}
-        }
-            \textbf{}
-            &
-            \textbf{Boğaziçi University}, Mechanical Engineering
-
-            \vspace{0.10 cm}
-
-            &
-            Istanbul, Turkey
-
-            Sept. 2015 to present
-        \end{tabularx}
-
         \vspace{0.2 cm}
         \begin{tabularx}{
             \textwidth-0.4 cm-0.13cm
@@ -1156,26 +1240,6 @@
             Jan. 2024
         \end{tabularx}
 
-        \vspace{0.2 cm}
-        \begin{tabularx}{
-            \textwidth-0.4 cm-0.13cm
-        }{
-            L{0.85cm}
-            K{0.2 cm}
-            R{4.1 cm}
-        }
-            \textbf{}
-            &
-            \textbf{Boğaziçi University}, Mechanical Engineering
-
-            \vspace{0.10 cm}
-
-            &
-            Istanbul, Turkey
-
-            Jan. 2024
-        \end{tabularx}
-
         \vspace{0.2 cm}
         \begin{tabularx}{
             \textwidth-0.4 cm-0.13cm
@@ -1220,26 +1284,6 @@
             Sept. 2021
         \end{tabularx}
 
-        \vspace{0.2 cm}
-        \begin{tabularx}{
-            \textwidth-0.4 cm-0.13cm
-        }{
-            L{0.85cm}
-            K{0.2 cm}
-            R{4.1 cm}
-        }
-            \textbf{}
-            &
-            \textbf{Boğaziçi University}, Mechanical Engineering
-
-            \vspace{0.10 cm}
-
-            &
-            Istanbul, Turkey
-
-            Sept. 2021
-        \end{tabularx}
-
         \vspace{0.2 cm}
         \begin{tabularx}{
             \textwidth-0.4 cm-0.13cm
@@ -1260,30 +1304,6 @@
             Sept. 2021
         \end{tabularx}
 
-        \vspace{0.2 cm}
-        \begin{tabularx}{
-            \textwidth-0.4 cm-0.13cm
-        }{
-            L{0.85cm}
-            K{0.2 cm}
-            R{4.1 cm}
-        }
-            \textbf{}
-            &
-            \textbf{Boğaziçi University}, Mechanical Engineering
-
-            \vspace{0.10 cm}
-
-            \begin{highlights}
-                \item Did this.
-                \item Did that.
-            \end{highlights}
-            &
-            Istanbul, Turkey
-
-            
-        \end{tabularx}
-
         \vspace{0.2 cm}
         \begin{tabularx}{
             \textwidth-0.4 cm-0.13cm
@@ -1308,70 +1328,6 @@
             
         \end{tabularx}
 
-        \vspace{0.2 cm}
-        \begin{tabularx}{
-            \textwidth-0.4 cm-0.13cm
-        }{
-            L{0.85cm}
-            K{0.2 cm}
-            R{4.1 cm}
-        }
-            \textbf{BS}
-            &
-            \textbf{Boğaziçi University}, Mechanical Engineering
-
-            \vspace{0.10 cm}
-
-            &
-            Istanbul, Turkey
-
-            
-        \end{tabularx}
-
-        \vspace{0.2 cm}
-        \begin{tabularx}{
-            \textwidth-0.4 cm-0.13cm
-        }{
-            L{0.85cm}
-            K{0.2 cm}
-            R{4.1 cm}
-        }
-            \textbf{}
-            &
-            \textbf{Boğaziçi University}, Mechanical Engineering
-
-            \vspace{0.10 cm}
-
-            &
-            
-
-            Sept. 2021
-        \end{tabularx}
-
-        \vspace{0.2 cm}
-        \begin{tabularx}{
-            \textwidth-0.4 cm-0.13cm
-        }{
-            L{0.85cm}
-            K{0.2 cm}
-            R{4.1 cm}
-        }
-            \textbf{}
-            &
-            \textbf{Boğaziçi University}, Mechanical Engineering
-
-            \vspace{0.10 cm}
-
-            \begin{highlights}
-                \item Did this.
-                \item Did that.
-            \end{highlights}
-            &
-            
-
-            Sept. 2015 to present
-        \end{tabularx}
-
         \vspace{0.2 cm}
         \begin{tabularx}{
             \textwidth-0.4 cm-0.13cm
@@ -1392,50 +1348,6 @@
             Sept. 2015 to present
         \end{tabularx}
 
-        \vspace{0.2 cm}
-        \begin{tabularx}{
-            \textwidth-0.4 cm-0.13cm
-        }{
-            L{0.85cm}
-            K{0.2 cm}
-            R{4.1 cm}
-        }
-            \textbf{BS}
-            &
-            \textbf{Boğaziçi University}, Mechanical Engineering
-
-            \vspace{0.10 cm}
-
-            &
-            
-
-            Sept. 2015 to present
-        \end{tabularx}
-
-        \vspace{0.2 cm}
-        \begin{tabularx}{
-            \textwidth-0.4 cm-0.13cm
-        }{
-            L{0.85cm}
-            K{0.2 cm}
-            R{4.1 cm}
-        }
-            \textbf{}
-            &
-            \textbf{Boğaziçi University}, Mechanical Engineering
-
-            \vspace{0.10 cm}
-
-            \begin{highlights}
-                \item Did this.
-                \item Did that.
-            \end{highlights}
-            &
-            
-
-            Sept. 2021
-        \end{tabularx}
-
         \vspace{0.2 cm}
         \begin{tabularx}{
             \textwidth-0.4 cm-0.13cm
@@ -1456,26 +1368,6 @@
             Sept. 2021
         \end{tabularx}
 
-        \vspace{0.2 cm}
-        \begin{tabularx}{
-            \textwidth-0.4 cm-0.13cm
-        }{
-            L{0.85cm}
-            K{0.2 cm}
-            R{4.1 cm}
-        }
-            \textbf{BS}
-            &
-            \textbf{Boğaziçi University}, Mechanical Engineering
-
-            \vspace{0.10 cm}
-
-            &
-            
-
-            Sept. 2021
-        \end{tabularx}
-
         \vspace{0.2 cm}
         \begin{tabularx}{
             \textwidth-0.4 cm-0.13cm
@@ -1500,30 +1392,6 @@
             Sept. 2015 to present
         \end{tabularx}
 
-        \vspace{0.2 cm}
-        \begin{tabularx}{
-            \textwidth-0.4 cm-0.13cm
-        }{
-            L{0.85cm}
-            K{0.2 cm}
-            R{4.1 cm}
-        }
-            \textbf{BS}
-            &
-            \textbf{Boğaziçi University}, Mechanical Engineering
-
-            \vspace{0.10 cm}
-
-            \begin{highlights}
-                \item Did this.
-                \item Did that.
-            \end{highlights}
-            &
-            
-
-            Sept. 2015 to present
-        \end{tabularx}
-
         \vspace{0.2 cm}
         \begin{tabularx}{
             \textwidth-0.4 cm-0.13cm
@@ -1544,30 +1412,6 @@
             Sept. 2015 to present
         \end{tabularx}
 
-        \vspace{0.2 cm}
-        \begin{tabularx}{
-            \textwidth-0.4 cm-0.13cm
-        }{
-            L{0.85cm}
-            K{0.2 cm}
-            R{4.1 cm}
-        }
-            \textbf{}
-            &
-            \textbf{Boğaziçi University}, Mechanical Engineering
-
-            \vspace{0.10 cm}
-
-            \begin{highlights}
-                \item Did this.
-                \item Did that.
-            \end{highlights}
-            &
-            
-
-            Sept. 2021
-        \end{tabularx}
-
         \vspace{0.2 cm}
         \begin{tabularx}{
             \textwidth-0.4 cm-0.13cm
@@ -1588,26 +1432,6 @@
             Sept. 2021
         \end{tabularx}
 
-        \vspace{0.2 cm}
-        \begin{tabularx}{
-            \textwidth-0.4 cm-0.13cm
-        }{
-            L{0.85cm}
-            K{0.2 cm}
-            R{4.1 cm}
-        }
-            \textbf{BS}
-            &
-            \textbf{Boğaziçi University}, Mechanical Engineering
-
-            \vspace{0.10 cm}
-
-            &
-            
-
-            Sept. 2021
-        \end{tabularx}
-
         \vspace{0.2 cm}
         \begin{tabularx}{
             \textwidth-0.4 cm-0.13cm
@@ -1632,30 +1456,6 @@
             Jan. 2024
         \end{tabularx}
 
-        \vspace{0.2 cm}
-        \begin{tabularx}{
-            \textwidth-0.4 cm-0.13cm
-        }{
-            L{0.85cm}
-            K{0.2 cm}
-            R{4.1 cm}
-        }
-            \textbf{BS}
-            &
-            \textbf{Boğaziçi University}, Mechanical Engineering
-
-            \vspace{0.10 cm}
-
-            \begin{highlights}
-                \item Did this.
-                \item Did that.
-            \end{highlights}
-            &
-            
-
-            Jan. 2024
-        \end{tabularx}
-
         \vspace{0.2 cm}
         \begin{tabularx}{
             \textwidth-0.4 cm-0.13cm
@@ -1700,30 +1500,6 @@
             Sept. 2021
         \end{tabularx}
 
-        \vspace{0.2 cm}
-        \begin{tabularx}{
-            \textwidth-0.4 cm-0.13cm
-        }{
-            L{0.85cm}
-            K{0.2 cm}
-            R{4.1 cm}
-        }
-            \textbf{BS}
-            &
-            \textbf{Boğaziçi University}, Mechanical Engineering
-
-            \vspace{0.10 cm}
-
-            \begin{highlights}
-                \item Did this.
-                \item Did that.
-            \end{highlights}
-            &
-            
-
-            Sept. 2021
-        \end{tabularx}
-
         \vspace{0.2 cm}
         \begin{tabularx}{
             \textwidth-0.4 cm-0.13cm
@@ -1782,50 +1558,6 @@
 
             \vspace{0.10 cm}
 
-            \begin{highlights}
-                \item Did this.
-                \item Did that.
-            \end{highlights}
-            &
-            
-
-            Sept. 2021
-        \end{tabularx}
-
-        \vspace{0.2 cm}
-        \begin{tabularx}{
-            \textwidth-0.4 cm-0.13cm
-        }{
-            L{0.85cm}
-            K{0.2 cm}
-            R{4.1 cm}
-        }
-            \textbf{}
-            &
-            \textbf{Boğaziçi University}, Mechanical Engineering
-
-            \vspace{0.10 cm}
-
-            &
-            Istanbul, Turkey
-
-            Sept. 2021
-        \end{tabularx}
-
-        \vspace{0.2 cm}
-        \begin{tabularx}{
-            \textwidth-0.4 cm-0.13cm
-        }{
-            L{0.85cm}
-            K{0.2 cm}
-            R{4.1 cm}
-        }
-            \textbf{BS}
-            &
-            \textbf{Boğaziçi University}, Mechanical Engineering
-
-            \vspace{0.10 cm}
-
             &
             
 
@@ -1851,7 +1583,7 @@
                 \item Did that.
             \end{highlights}
             &
-            Istanbul, Turkey
+            
 
             Sept. 2015 to present
         \end{tabularx}
@@ -1870,6 +1602,26 @@
 
             \vspace{0.10 cm}
 
+            &
+            
+
+            Sept. 2015 to present
+        \end{tabularx}
+
+        \vspace{0.2 cm}
+        \begin{tabularx}{
+            \textwidth-0.4 cm-0.13cm
+        }{
+            L{0.85cm}
+            K{0.2 cm}
+            R{4.1 cm}
+        }
+            \textbf{}
+            &
+            \textbf{Boğaziçi University}, Mechanical Engineering
+
+            \vspace{0.10 cm}
+
             \begin{highlights}
                 \item Did this.
                 \item Did that.
@@ -1877,6 +1629,186 @@
             &
             
 
+            Sept. 2021
+        \end{tabularx}
+
+        \vspace{0.2 cm}
+        \begin{tabularx}{
+            \textwidth-0.4 cm-0.13cm
+        }{
+            L{0.85cm}
+            K{0.2 cm}
+            R{4.1 cm}
+        }
+            \textbf{BS}
+            &
+            \textbf{Boğaziçi University}, Mechanical Engineering
+
+            \vspace{0.10 cm}
+
+            &
+            
+
+            Sept. 2021
+        \end{tabularx}
+
+        \vspace{0.2 cm}
+        \begin{tabularx}{
+            \textwidth-0.4 cm-0.13cm
+        }{
+            L{0.85cm}
+            K{0.2 cm}
+            R{4.1 cm}
+        }
+            \textbf{BS}
+            &
+            \textbf{Boğaziçi University}, Mechanical Engineering
+
+            \vspace{0.10 cm}
+
+            \begin{highlights}
+                \item Did this.
+                \item Did that.
+            \end{highlights}
+            &
+            
+
+            Sept. 2015 to present
+        \end{tabularx}
+
+        \vspace{0.2 cm}
+        \begin{tabularx}{
+            \textwidth-0.4 cm-0.13cm
+        }{
+            L{0.85cm}
+            K{0.2 cm}
+            R{4.1 cm}
+        }
+            \textbf{}
+            &
+            \textbf{Boğaziçi University}, Mechanical Engineering
+
+            \vspace{0.10 cm}
+
+            \begin{highlights}
+                \item Did this.
+                \item Did that.
+            \end{highlights}
+            &
+            
+
+            Sept. 2021
+        \end{tabularx}
+
+        \vspace{0.2 cm}
+        \begin{tabularx}{
+            \textwidth-0.4 cm-0.13cm
+        }{
+            L{0.85cm}
+            K{0.2 cm}
+            R{4.1 cm}
+        }
+            \textbf{BS}
+            &
+            \textbf{Boğaziçi University}, Mechanical Engineering
+
+            \vspace{0.10 cm}
+
+            &
+            
+
+            Sept. 2021
+        \end{tabularx}
+
+        \vspace{0.2 cm}
+        \begin{tabularx}{
+            \textwidth-0.4 cm-0.13cm
+        }{
+            L{0.85cm}
+            K{0.2 cm}
+            R{4.1 cm}
+        }
+            \textbf{BS}
+            &
+            \textbf{Boğaziçi University}, Mechanical Engineering
+
+            \vspace{0.10 cm}
+
+            \begin{highlights}
+                \item Did this.
+                \item Did that.
+            \end{highlights}
+            &
+            
+
+            Jan. 2024
+        \end{tabularx}
+
+        \vspace{0.2 cm}
+        \begin{tabularx}{
+            \textwidth-0.4 cm-0.13cm
+        }{
+            L{0.85cm}
+            K{0.2 cm}
+            R{4.1 cm}
+        }
+            \textbf{BS}
+            &
+            \textbf{Boğaziçi University}, Mechanical Engineering
+
+            \vspace{0.10 cm}
+
+            \begin{highlights}
+                \item Did this.
+                \item Did that.
+            \end{highlights}
+            &
+            
+
+            Sept. 2021
+        \end{tabularx}
+
+        \vspace{0.2 cm}
+        \begin{tabularx}{
+            \textwidth-0.4 cm-0.13cm
+        }{
+            L{0.85cm}
+            K{0.2 cm}
+            R{4.1 cm}
+        }
+            \textbf{}
+            &
+            \textbf{Boğaziçi University}, Mechanical Engineering
+
+            \vspace{0.10 cm}
+
+            &
+            Istanbul, Turkey
+
+            Sept. 2021
+        \end{tabularx}
+
+        \vspace{0.2 cm}
+        \begin{tabularx}{
+            \textwidth-0.4 cm-0.13cm
+        }{
+            L{0.85cm}
+            K{0.2 cm}
+            R{4.1 cm}
+        }
+            \textbf{}
+            &
+            \textbf{Boğaziçi University}, Mechanical Engineering
+
+            \vspace{0.10 cm}
+
+            \begin{highlights}
+                \item Did this.
+                \item Did that.
+            \end{highlights}
+            &
+            Istanbul, Turkey
+
             Sept. 2015 to present
         \end{tabularx}
 
@@ -1924,30 +1856,6 @@
             Sept. 2021
         \end{tabularx}
 
-        \vspace{0.2 cm}
-        \begin{tabularx}{
-            \textwidth-0.4 cm-0.13cm
-        }{
-            L{0.85cm}
-            K{0.2 cm}
-            R{4.1 cm}
-        }
-            \textbf{BS}
-            &
-            \textbf{Boğaziçi University}, Mechanical Engineering
-
-            \vspace{0.10 cm}
-
-            \begin{highlights}
-                \item Did this.
-                \item Did that.
-            \end{highlights}
-            &
-            
-
-            Sept. 2021
-        \end{tabularx}
-
         \vspace{0.2 cm}
         \begin{tabularx}{
             \textwidth-0.4 cm-0.13cm
@@ -2016,30 +1924,6 @@
             Sept. 2021
         \end{tabularx}
 
-        \vspace{0.2 cm}
-        \begin{tabularx}{
-            \textwidth-0.4 cm-0.13cm
-        }{
-            L{0.85cm}
-            K{0.2 cm}
-            R{4.1 cm}
-        }
-            \textbf{BS}
-            &
-            \textbf{Boğaziçi University}, Mechanical Engineering
-
-            \vspace{0.10 cm}
-
-            \begin{highlights}
-                \item Did this.
-                \item Did that.
-            \end{highlights}
-            &
-            
-
-            Sept. 2021
-        \end{tabularx}
-
         \vspace{0.2 cm}
         \begin{tabularx}{
             \textwidth-0.4 cm-0.13cm
@@ -2127,7 +2011,27 @@
                 \item Did that.
             \end{highlights}
             &
-            Istanbul, Turkey
+            
+
+            Sept. 2021
+        \end{tabularx}
+
+        \vspace{0.2 cm}
+        \begin{tabularx}{
+            \textwidth-0.4 cm-0.13cm
+        }{
+            L{0.85cm}
+            K{0.2 cm}
+            R{4.1 cm}
+        }
+            \textbf{BS}
+            &
+            \textbf{Boğaziçi University}, Mechanical Engineering
+
+            \vspace{0.10 cm}
+
+            &
+            
 
             Sept. 2021
         \end{tabularx}
@@ -2153,6 +2057,78 @@
             &
             
 
+            Sept. 2015 to present
+        \end{tabularx}
+
+        \vspace{0.2 cm}
+        \begin{tabularx}{
+            \textwidth-0.4 cm-0.13cm
+        }{
+            L{0.85cm}
+            K{0.2 cm}
+            R{4.1 cm}
+        }
+            \textbf{BS}
+            &
+            \textbf{Boğaziçi University}, Mechanical Engineering
+
+            \vspace{0.10 cm}
+
+            \begin{highlights}
+                \item Did this.
+                \item Did that.
+            \end{highlights}
+            &
+            
+
+            Sept. 2021
+        \end{tabularx}
+
+        \vspace{0.2 cm}
+        \begin{tabularx}{
+            \textwidth-0.4 cm-0.13cm
+        }{
+            L{0.85cm}
+            K{0.2 cm}
+            R{4.1 cm}
+        }
+            \textbf{BS}
+            &
+            \textbf{Boğaziçi University}, Mechanical Engineering
+
+            \vspace{0.10 cm}
+
+            \begin{highlights}
+                \item Did this.
+                \item Did that.
+            \end{highlights}
+            &
+            
+
+            Sept. 2021
+        \end{tabularx}
+
+        \vspace{0.2 cm}
+        \begin{tabularx}{
+            \textwidth-0.4 cm-0.13cm
+        }{
+            L{0.85cm}
+            K{0.2 cm}
+            R{4.1 cm}
+        }
+            \textbf{}
+            &
+            \textbf{Boğaziçi University}, Mechanical Engineering
+
+            \vspace{0.10 cm}
+
+            \begin{highlights}
+                \item Did this.
+                \item Did that.
+            \end{highlights}
+            &
+            Istanbul, Turkey
+
             Sept. 2021
         \end{tabularx}
 
@@ -2248,6 +2224,30 @@
             Sept. 2021
         \end{tabularx}
 
+        \vspace{0.2 cm}
+        \begin{tabularx}{
+            \textwidth-0.4 cm-0.13cm
+        }{
+            L{0.85cm}
+            K{0.2 cm}
+            R{4.1 cm}
+        }
+            \textbf{BS}
+            &
+            \textbf{Boğaziçi University}, Mechanical Engineering
+
+            \vspace{0.10 cm}
+
+            \begin{highlights}
+                \item Did this.
+                \item Did that.
+            \end{highlights}
+            &
+            
+
+            Sept. 2021
+        \end{tabularx}
+
         \vspace{0.2 cm}
         \begin{tabularx}{
             \textwidth-0.4 cm-0.13cm
@@ -2288,6 +2288,24 @@
         \end{tabularx}
 
 
+        \vspace{0.2 cm}
+        \begin{tabularx}{
+            \textwidth-0.4 cm-0.13cm
+        }{
+            K{0.2 cm}
+            R{4.1 cm}
+        }
+            \textbf{My Project}
+
+            \vspace{0.10 cm}
+
+            &
+            Istanbul, Turkey
+
+            
+        \end{tabularx}
+
+
         \vspace{0.2 cm}
         \begin{tabularx}{
             \textwidth-0.4 cm-0.13cm
@@ -2373,6 +2391,64 @@
             &
             Istanbul, Turkey
 
+            Sept. 2015 to present
+        \end{tabularx}
+
+
+        \vspace{0.2 cm}
+        \begin{tabularx}{
+            \textwidth-0.4 cm-0.13cm
+        }{
+            K{0.2 cm}
+            R{4.1 cm}
+        }
+            \textbf{My Project}
+
+            \vspace{0.10 cm}
+
+            &
+            Istanbul, Turkey
+
+            Jan. 2024
+        \end{tabularx}
+
+
+        \vspace{0.2 cm}
+        \begin{tabularx}{
+            \textwidth-0.4 cm-0.13cm
+        }{
+            K{0.2 cm}
+            R{4.1 cm}
+        }
+            \textbf{My Project}
+
+            \vspace{0.10 cm}
+
+            &
+            Istanbul, Turkey
+
+            Sept. 2021
+        \end{tabularx}
+
+
+        \vspace{0.2 cm}
+        \begin{tabularx}{
+            \textwidth-0.4 cm-0.13cm
+        }{
+            K{0.2 cm}
+            R{4.1 cm}
+        }
+            \textbf{My Project}
+
+            \vspace{0.10 cm}
+
+            \begin{highlights}
+                \item Did this.
+                \item Did that.
+            \end{highlights}
+            &
+            Istanbul, Turkey
+
             
         \end{tabularx}
 
@@ -2435,24 +2511,6 @@
         \end{tabularx}
 
 
-        \vspace{0.2 cm}
-        \begin{tabularx}{
-            \textwidth-0.4 cm-0.13cm
-        }{
-            K{0.2 cm}
-            R{4.1 cm}
-        }
-            \textbf{My Project}
-
-            \vspace{0.10 cm}
-
-            &
-            Istanbul, Turkey
-
-            Sept. 2015 to present
-        \end{tabularx}
-
-
         \vspace{0.2 cm}
         \begin{tabularx}{
             \textwidth-0.4 cm-0.13cm
@@ -2493,24 +2551,6 @@
         \end{tabularx}
 
 
-        \vspace{0.2 cm}
-        \begin{tabularx}{
-            \textwidth-0.4 cm-0.13cm
-        }{
-            K{0.2 cm}
-            R{4.1 cm}
-        }
-            \textbf{My Project}
-
-            \vspace{0.10 cm}
-
-            &
-            Istanbul, Turkey
-
-            Jan. 2024
-        \end{tabularx}
-
-
         \vspace{0.2 cm}
         \begin{tabularx}{
             \textwidth-0.4 cm-0.13cm
@@ -2533,86 +2573,6 @@
         \end{tabularx}
 
 
-        \vspace{0.2 cm}
-        \begin{tabularx}{
-            \textwidth-0.4 cm-0.13cm
-        }{
-            K{0.2 cm}
-            R{4.1 cm}
-        }
-            \textbf{My Project}
-
-            \vspace{0.10 cm}
-
-            &
-            Istanbul, Turkey
-
-            Sept. 2021
-        \end{tabularx}
-
-
-        \vspace{0.2 cm}
-        \begin{tabularx}{
-            \textwidth-0.4 cm-0.13cm
-        }{
-            K{0.2 cm}
-            R{4.1 cm}
-        }
-            \textbf{My Project}
-
-            \vspace{0.10 cm}
-
-            \begin{highlights}
-                \item Did this.
-                \item Did that.
-            \end{highlights}
-            &
-            Istanbul, Turkey
-
-            
-        \end{tabularx}
-
-
-        \vspace{0.2 cm}
-        \begin{tabularx}{
-            \textwidth-0.4 cm-0.13cm
-        }{
-            K{0.2 cm}
-            R{4.1 cm}
-        }
-            \textbf{My Project}
-
-            \vspace{0.10 cm}
-
-            &
-            
-
-            Sept. 2021
-        \end{tabularx}
-
-
-        \vspace{0.2 cm}
-        \begin{tabularx}{
-            \textwidth-0.4 cm-0.13cm
-        }{
-            K{0.2 cm}
-            R{4.1 cm}
-        }
-            \textbf{My Project}
-
-            \vspace{0.10 cm}
-
-            \begin{highlights}
-                \item Did this.
-                \item Did that.
-            \end{highlights}
-            &
-            
-
-            Sept. 2015 to present
-        \end{tabularx}
-
-
         \vspace{0.2 cm}
         \begin{tabularx}{
             \textwidth-0.4 cm-0.13cm
@@ -2631,28 +2591,6 @@
         \end{tabularx}
 
 
-        \vspace{0.2 cm}
-        \begin{tabularx}{
-            \textwidth-0.4 cm-0.13cm
-        }{
-            K{0.2 cm}
-            R{4.1 cm}
-        }
-            \textbf{My Project}
-
-            \vspace{0.10 cm}
-
-            \begin{highlights}
-                \item Did this.
-                \item Did that.
-            \end{highlights}
-            &
-            
-
-            Sept. 2021
-        \end{tabularx}
-
-
         \vspace{0.2 cm}
         \begin{tabularx}{
             \textwidth-0.4 cm-0.13cm
@@ -2693,28 +2631,6 @@
         \end{tabularx}
 
 
-        \vspace{0.2 cm}
-        \begin{tabularx}{
-            \textwidth-0.4 cm-0.13cm
-        }{
-            K{0.2 cm}
-            R{4.1 cm}
-        }
-            \textbf{My Project}
-
-            \vspace{0.10 cm}
-
-            \begin{highlights}
-                \item Did this.
-                \item Did that.
-            \end{highlights}
-            &
-            
-
-            Sept. 2021
-        \end{tabularx}
-
-
         \vspace{0.2 cm}
         \begin{tabularx}{
             \textwidth-0.4 cm-0.13cm
@@ -2777,6 +2693,68 @@
         \end{tabularx}
 
 
+        \vspace{0.2 cm}
+        \begin{tabularx}{
+            \textwidth-0.4 cm-0.13cm
+        }{
+            K{0.2 cm}
+            R{4.1 cm}
+        }
+            \textbf{My Project}
+
+            \vspace{0.10 cm}
+
+            &
+            
+
+            Sept. 2021
+        \end{tabularx}
+
+
+        \vspace{0.2 cm}
+        \begin{tabularx}{
+            \textwidth-0.4 cm-0.13cm
+        }{
+            K{0.2 cm}
+            R{4.1 cm}
+        }
+            \textbf{My Project}
+
+            \vspace{0.10 cm}
+
+            \begin{highlights}
+                \item Did this.
+                \item Did that.
+            \end{highlights}
+            &
+            
+
+            Sept. 2015 to present
+        \end{tabularx}
+
+
+        \vspace{0.2 cm}
+        \begin{tabularx}{
+            \textwidth-0.4 cm-0.13cm
+        }{
+            K{0.2 cm}
+            R{4.1 cm}
+        }
+            \textbf{My Project}
+
+            \vspace{0.10 cm}
+
+            \begin{highlights}
+                \item Did this.
+                \item Did that.
+            \end{highlights}
+            &
+            
+
+            Sept. 2021
+        \end{tabularx}
+
+
         \vspace{0.2 cm}
         \begin{tabularx}{
             \textwidth-0.4 cm-0.13cm
@@ -2883,6 +2861,28 @@
         \end{tabularx}
 
 
+        \vspace{0.2 cm}
+        \begin{tabularx}{
+            \textwidth-0.4 cm-0.13cm
+        }{
+            K{0.2 cm}
+            R{4.1 cm}
+        }
+            \textbf{My Project}
+
+            \vspace{0.10 cm}
+
+            \begin{highlights}
+                \item Did this.
+                \item Did that.
+            \end{highlights}
+            &
+            
+
+            Sept. 2021
+        \end{tabularx}
+
+
         \vspace{0.2 cm}
         \begin{tabularx}{
             \textwidth-0.4 cm-0.13cm
diff --git a/tests/testdata/test_generate_latex_file/moderncv_empty/None_CV.tex b/tests/testdata/test_generate_latex_file/moderncv_empty.tex
similarity index 100%
rename from tests/testdata/test_generate_latex_file/moderncv_empty/None_CV.tex
rename to tests/testdata/test_generate_latex_file/moderncv_empty.tex
diff --git a/tests/testdata/test_generate_latex_file/moderncv_filled/John_Doe_CV.tex b/tests/testdata/test_generate_latex_file/moderncv_filled.tex
similarity index 99%
rename from tests/testdata/test_generate_latex_file/moderncv_filled/John_Doe_CV.tex
rename to tests/testdata/test_generate_latex_file/moderncv_filled.tex
index 237d4122..ebaff72f 100644
--- a/tests/testdata/test_generate_latex_file/moderncv_filled/John_Doe_CV.tex
+++ b/tests/testdata/test_generate_latex_file/moderncv_filled.tex
@@ -118,6 +118,9 @@
         \cventry{}{Software Engineer}{Some Company}{}{}{}
 
 
+        \cventry{}{Software Engineer}{Some Company}{Istanbul, Turkey}{}{}
+
+
         \cventry{Sept. 2015 to present}{Software Engineer}{Some Company}{}{}{}
 
 
@@ -132,7 +135,18 @@
         \cvlistitem{Did that.}
 
 
+        \cventry{Sept. 2015 to present}{Software Engineer}{Some Company}{Istanbul, Turkey}{}{}
+
+
+        \cventry{Jan. 2024}{Software Engineer}{Some Company}{Istanbul, Turkey}{}{}
+
+
+        \cventry{Sept. 2021}{Software Engineer}{Some Company}{Istanbul, Turkey}{}{}
+
+
         \cventry{}{Software Engineer}{Some Company}{Istanbul, Turkey}{}{}
+        \cvlistitem{Did this.}
+        \cvlistitem{Did that.}
 
 
         \cventry{Sept. 2015 to present}{Software Engineer}{Some Company}{}{}{}
@@ -146,9 +160,6 @@
         \cvlistitem{Did that.}
 
 
-        \cventry{Sept. 2015 to present}{Software Engineer}{Some Company}{Istanbul, Turkey}{}{}
-
-
         \cventry{Sept. 2021}{Software Engineer}{Some Company}{}{}{}
 
 
@@ -157,18 +168,31 @@
         \cvlistitem{Did that.}
 
 
-        \cventry{Jan. 2024}{Software Engineer}{Some Company}{Istanbul, Turkey}{}{}
-
-
         \cventry{Sept. 2021}{Software Engineer}{Some Company}{}{}{}
         \cvlistitem{Did this.}
         \cvlistitem{Did that.}
 
 
+        \cventry{Sept. 2015 to present}{Software Engineer}{Some Company}{Istanbul, Turkey}{}{}
+
+
+        \cventry{Sept. 2021}{Software Engineer}{Some Company}{Istanbul, Turkey}{}{}
+
+
+        \cventry{Sept. 2015 to present}{Software Engineer}{Some Company}{Istanbul, Turkey}{}{}
+        \cvlistitem{Did this.}
+        \cvlistitem{Did that.}
+
+
         \cventry{Sept. 2021}{Software Engineer}{Some Company}{Istanbul, Turkey}{}{}
 
 
-        \cventry{}{Software Engineer}{Some Company}{Istanbul, Turkey}{}{}
+        \cventry{Jan. 2024}{Software Engineer}{Some Company}{Istanbul, Turkey}{}{}
+        \cvlistitem{Did this.}
+        \cvlistitem{Did that.}
+
+
+        \cventry{Sept. 2021}{Software Engineer}{Some Company}{Istanbul, Turkey}{}{}
         \cvlistitem{Did this.}
         \cvlistitem{Did that.}
 
@@ -181,40 +205,11 @@
         \cvlistitem{Did that.}
 
 
-        \cventry{Sept. 2015 to present}{Software Engineer}{Some Company}{Istanbul, Turkey}{}{}
-
-
         \cventry{Sept. 2021}{Software Engineer}{Some Company}{}{}{}
         \cvlistitem{Did this.}
         \cvlistitem{Did that.}
 
 
-        \cventry{Sept. 2021}{Software Engineer}{Some Company}{Istanbul, Turkey}{}{}
-
-
-        \cventry{Sept. 2015 to present}{Software Engineer}{Some Company}{Istanbul, Turkey}{}{}
-        \cvlistitem{Did this.}
-        \cvlistitem{Did that.}
-
-
-        \cventry{Sept. 2021}{Software Engineer}{Some Company}{}{}{}
-        \cvlistitem{Did this.}
-        \cvlistitem{Did that.}
-
-
-        \cventry{Sept. 2021}{Software Engineer}{Some Company}{Istanbul, Turkey}{}{}
-
-
-        \cventry{Jan. 2024}{Software Engineer}{Some Company}{Istanbul, Turkey}{}{}
-        \cvlistitem{Did this.}
-        \cvlistitem{Did that.}
-
-
-        \cventry{Sept. 2021}{Software Engineer}{Some Company}{Istanbul, Turkey}{}{}
-        \cvlistitem{Did this.}
-        \cvlistitem{Did that.}
-
-
         \cventry{Sept. 2021}{Software Engineer}{Some Company}{}{}{}
         \cvlistitem{Did this.}
         \cvlistitem{Did that.}
@@ -238,6 +233,11 @@
         \cvlistitem{Did that.}
 
 
+        \cventry{Sept. 2021}{Software Engineer}{Some Company}{}{}{}
+        \cvlistitem{Did this.}
+        \cvlistitem{Did that.}
+
+
         \cventry{Sept. 2021}{Software Engineer}{Some Company}{Istanbul, Turkey}{}{}
         \cvlistitem{Did this.}
         \cvlistitem{Did that.}
@@ -250,6 +250,9 @@
         \cventry{}{Mechanical Engineering}{Boğaziçi University}{}{}{}
 
 
+        \cventry{}{Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
+
+
         \cventry{Sept. 2015 to present}{Mechanical Engineering}{Boğaziçi University}{}{}{}
 
 
@@ -264,12 +267,26 @@
         \cvlistitem{Did that.}
 
 
-        \cventry{}{Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
-
-
         \cventry{}{BS, Mechanical Engineering}{Boğaziçi University}{}{}{}
 
 
+        \cventry{Sept. 2015 to present}{Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
+
+
+        \cventry{Jan. 2024}{Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
+
+
+        \cventry{Sept. 2021}{Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
+
+
+        \cventry{}{Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
+        \cvlistitem{Did this.}
+        \cvlistitem{Did that.}
+
+
+        \cventry{}{BS, Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
+
+
         \cventry{Sept. 2015 to present}{Mechanical Engineering}{Boğaziçi University}{}{}{}
 
 
@@ -281,9 +298,6 @@
         \cvlistitem{Did that.}
 
 
-        \cventry{Sept. 2015 to present}{Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
-
-
         \cventry{Sept. 2015 to present}{BS, Mechanical Engineering}{Boğaziçi University}{}{}{}
 
 
@@ -295,9 +309,6 @@
         \cvlistitem{Did that.}
 
 
-        \cventry{Jan. 2024}{Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
-
-
         \cventry{Jan. 2024}{BS, Mechanical Engineering}{Boğaziçi University}{}{}{}
 
 
@@ -306,23 +317,50 @@
         \cvlistitem{Did that.}
 
 
-        \cventry{Sept. 2021}{Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
-
-
         \cventry{Sept. 2021}{BS, Mechanical Engineering}{Boğaziçi University}{}{}{}
 
 
-        \cventry{}{Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
-        \cvlistitem{Did this.}
-        \cvlistitem{Did that.}
-
-
         \cventry{}{BS, Mechanical Engineering}{Boğaziçi University}{}{}{}
         \cvlistitem{Did this.}
         \cvlistitem{Did that.}
 
 
+        \cventry{Sept. 2015 to present}{Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
+
+
+        \cventry{Sept. 2021}{Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
+
+
+        \cventry{Sept. 2015 to present}{Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
+        \cvlistitem{Did this.}
+        \cvlistitem{Did that.}
+
+
+        \cventry{Sept. 2015 to present}{BS, Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
+
+
+        \cventry{Sept. 2021}{Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
+
+
+        \cventry{Jan. 2024}{Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
+        \cvlistitem{Did this.}
+        \cvlistitem{Did that.}
+
+
+        \cventry{Jan. 2024}{BS, Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
+
+
+        \cventry{Sept. 2021}{Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
+        \cvlistitem{Did this.}
+        \cvlistitem{Did that.}
+
+
+        \cventry{Sept. 2021}{BS, Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
+
+
         \cventry{}{BS, Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
+        \cvlistitem{Did this.}
+        \cvlistitem{Did that.}
 
 
         \cventry{Sept. 2021}{Mechanical Engineering}{Boğaziçi University}{}{}{}
@@ -333,9 +371,6 @@
         \cvlistitem{Did that.}
 
 
-        \cventry{Sept. 2015 to present}{Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
-
-
         \cventry{Sept. 2015 to present}{BS, Mechanical Engineering}{Boğaziçi University}{}{}{}
 
 
@@ -344,47 +379,41 @@
         \cvlistitem{Did that.}
 
 
-        \cventry{Sept. 2021}{Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
-
-
         \cventry{Sept. 2021}{BS, Mechanical Engineering}{Boğaziçi University}{}{}{}
 
 
-        \cventry{Sept. 2015 to present}{Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
-        \cvlistitem{Did this.}
-        \cvlistitem{Did that.}
-
-
         \cventry{Sept. 2015 to present}{BS, Mechanical Engineering}{Boğaziçi University}{}{}{}
         \cvlistitem{Did this.}
         \cvlistitem{Did that.}
 
 
-        \cventry{Sept. 2015 to present}{BS, Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
-
-
         \cventry{Sept. 2021}{Mechanical Engineering}{Boğaziçi University}{}{}{}
         \cvlistitem{Did this.}
         \cvlistitem{Did that.}
 
 
-        \cventry{Sept. 2021}{Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
-
-
         \cventry{Sept. 2021}{BS, Mechanical Engineering}{Boğaziçi University}{}{}{}
 
 
-        \cventry{Jan. 2024}{Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
-        \cvlistitem{Did this.}
-        \cvlistitem{Did that.}
-
-
         \cventry{Jan. 2024}{BS, Mechanical Engineering}{Boğaziçi University}{}{}{}
         \cvlistitem{Did this.}
         \cvlistitem{Did that.}
 
 
-        \cventry{Jan. 2024}{BS, Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
+        \cventry{Sept. 2021}{BS, Mechanical Engineering}{Boğaziçi University}{}{}{}
+        \cvlistitem{Did this.}
+        \cvlistitem{Did that.}
+
+
+        \cventry{Sept. 2021}{Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
+
+
+        \cventry{Sept. 2015 to present}{Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
+        \cvlistitem{Did this.}
+        \cvlistitem{Did that.}
+
+
+        \cventry{Sept. 2015 to present}{BS, Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
 
 
         \cventry{Sept. 2021}{Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
@@ -392,7 +421,15 @@
         \cvlistitem{Did that.}
 
 
-        \cventry{Sept. 2021}{BS, Mechanical Engineering}{Boğaziçi University}{}{}{}
+        \cventry{Sept. 2021}{BS, Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
+
+
+        \cventry{Sept. 2015 to present}{BS, Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
+        \cvlistitem{Did this.}
+        \cvlistitem{Did that.}
+
+
+        \cventry{Sept. 2021}{Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
         \cvlistitem{Did this.}
         \cvlistitem{Did that.}
 
@@ -400,7 +437,12 @@
         \cventry{Sept. 2021}{BS, Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
 
 
-        \cventry{}{BS, Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
+        \cventry{Jan. 2024}{BS, Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
+        \cvlistitem{Did this.}
+        \cvlistitem{Did that.}
+
+
+        \cventry{Sept. 2021}{BS, Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
         \cvlistitem{Did this.}
         \cvlistitem{Did that.}
 
@@ -410,26 +452,15 @@
         \cvlistitem{Did that.}
 
 
-        \cventry{Sept. 2021}{Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
-
-
         \cventry{Sept. 2021}{BS, Mechanical Engineering}{Boğaziçi University}{}{}{}
 
 
-        \cventry{Sept. 2015 to present}{Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
-        \cvlistitem{Did this.}
-        \cvlistitem{Did that.}
-
-
         \cventry{Sept. 2015 to present}{BS, Mechanical Engineering}{Boğaziçi University}{}{}{}
         \cvlistitem{Did this.}
         \cvlistitem{Did that.}
 
 
-        \cventry{Sept. 2015 to present}{BS, Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
-
-
-        \cventry{Sept. 2021}{Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
+        \cventry{Sept. 2021}{BS, Mechanical Engineering}{Boğaziçi University}{}{}{}
         \cvlistitem{Did this.}
         \cvlistitem{Did that.}
 
@@ -439,47 +470,11 @@
         \cvlistitem{Did that.}
 
 
-        \cventry{Sept. 2021}{BS, Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
-
-
-        \cventry{Sept. 2015 to present}{BS, Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
-        \cvlistitem{Did this.}
-        \cvlistitem{Did that.}
-
-
         \cventry{Sept. 2021}{Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
         \cvlistitem{Did this.}
         \cvlistitem{Did that.}
 
 
-        \cventry{Sept. 2021}{BS, Mechanical Engineering}{Boğaziçi University}{}{}{}
-        \cvlistitem{Did this.}
-        \cvlistitem{Did that.}
-
-
-        \cventry{Sept. 2021}{BS, Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
-
-
-        \cventry{Jan. 2024}{BS, Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
-        \cvlistitem{Did this.}
-        \cvlistitem{Did that.}
-
-
-        \cventry{Sept. 2021}{BS, Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
-        \cvlistitem{Did this.}
-        \cvlistitem{Did that.}
-
-
-        \cventry{Sept. 2021}{Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
-        \cvlistitem{Did this.}
-        \cvlistitem{Did that.}
-
-
-        \cventry{Sept. 2021}{BS, Mechanical Engineering}{Boğaziçi University}{}{}{}
-        \cvlistitem{Did this.}
-        \cvlistitem{Did that.}
-
-
         \cventry{Sept. 2021}{BS, Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
 
 
@@ -498,6 +493,11 @@
         \cvlistitem{Did that.}
 
 
+        \cventry{Sept. 2021}{BS, Mechanical Engineering}{Boğaziçi University}{}{}{}
+        \cvlistitem{Did this.}
+        \cvlistitem{Did that.}
+
+
         \cventry{Sept. 2021}{BS, Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
         \cvlistitem{Did this.}
         \cvlistitem{Did that.}
@@ -510,6 +510,9 @@
         \cventry{}{My Project}{}{}{}{}
 
 
+        \cventry{}{My Project}{}{Istanbul, Turkey}{}{}
+
+
         \cventry{Sept. 2015 to present}{My Project}{}{}{}{}
 
 
@@ -524,7 +527,18 @@
         \cvlistitem{Did that.}
 
 
+        \cventry{Sept. 2015 to present}{My Project}{}{Istanbul, Turkey}{}{}
+
+
+        \cventry{Jan. 2024}{My Project}{}{Istanbul, Turkey}{}{}
+
+
+        \cventry{Sept. 2021}{My Project}{}{Istanbul, Turkey}{}{}
+
+
         \cventry{}{My Project}{}{Istanbul, Turkey}{}{}
+        \cvlistitem{Did this.}
+        \cvlistitem{Did that.}
 
 
         \cventry{Sept. 2015 to present}{My Project}{}{}{}{}
@@ -538,9 +552,6 @@
         \cvlistitem{Did that.}
 
 
-        \cventry{Sept. 2015 to present}{My Project}{}{Istanbul, Turkey}{}{}
-
-
         \cventry{Sept. 2021}{My Project}{}{}{}{}
 
 
@@ -549,18 +560,31 @@
         \cvlistitem{Did that.}
 
 
-        \cventry{Jan. 2024}{My Project}{}{Istanbul, Turkey}{}{}
-
-
         \cventry{Sept. 2021}{My Project}{}{}{}{}
         \cvlistitem{Did this.}
         \cvlistitem{Did that.}
 
 
+        \cventry{Sept. 2015 to present}{My Project}{}{Istanbul, Turkey}{}{}
+
+
+        \cventry{Sept. 2021}{My Project}{}{Istanbul, Turkey}{}{}
+
+
+        \cventry{Sept. 2015 to present}{My Project}{}{Istanbul, Turkey}{}{}
+        \cvlistitem{Did this.}
+        \cvlistitem{Did that.}
+
+
         \cventry{Sept. 2021}{My Project}{}{Istanbul, Turkey}{}{}
 
 
-        \cventry{}{My Project}{}{Istanbul, Turkey}{}{}
+        \cventry{Jan. 2024}{My Project}{}{Istanbul, Turkey}{}{}
+        \cvlistitem{Did this.}
+        \cvlistitem{Did that.}
+
+
+        \cventry{Sept. 2021}{My Project}{}{Istanbul, Turkey}{}{}
         \cvlistitem{Did this.}
         \cvlistitem{Did that.}
 
@@ -573,40 +597,11 @@
         \cvlistitem{Did that.}
 
 
-        \cventry{Sept. 2015 to present}{My Project}{}{Istanbul, Turkey}{}{}
-
-
         \cventry{Sept. 2021}{My Project}{}{}{}{}
         \cvlistitem{Did this.}
         \cvlistitem{Did that.}
 
 
-        \cventry{Sept. 2021}{My Project}{}{Istanbul, Turkey}{}{}
-
-
-        \cventry{Sept. 2015 to present}{My Project}{}{Istanbul, Turkey}{}{}
-        \cvlistitem{Did this.}
-        \cvlistitem{Did that.}
-
-
-        \cventry{Sept. 2021}{My Project}{}{}{}{}
-        \cvlistitem{Did this.}
-        \cvlistitem{Did that.}
-
-
-        \cventry{Sept. 2021}{My Project}{}{Istanbul, Turkey}{}{}
-
-
-        \cventry{Jan. 2024}{My Project}{}{Istanbul, Turkey}{}{}
-        \cvlistitem{Did this.}
-        \cvlistitem{Did that.}
-
-
-        \cventry{Sept. 2021}{My Project}{}{Istanbul, Turkey}{}{}
-        \cvlistitem{Did this.}
-        \cvlistitem{Did that.}
-
-
         \cventry{Sept. 2021}{My Project}{}{}{}{}
         \cvlistitem{Did this.}
         \cvlistitem{Did that.}
@@ -630,6 +625,11 @@
         \cvlistitem{Did that.}
 
 
+        \cventry{Sept. 2021}{My Project}{}{}{}{}
+        \cvlistitem{Did this.}
+        \cvlistitem{Did that.}
+
+
         \cventry{Sept. 2021}{My Project}{}{Istanbul, Turkey}{}{}
         \cvlistitem{Did this.}
         \cvlistitem{Did that.}
diff --git a/tests/testdata/test_generate_latex_file/sb2nov_empty/None_CV.tex b/tests/testdata/test_generate_latex_file/sb2nov_empty.tex
similarity index 100%
rename from tests/testdata/test_generate_latex_file/sb2nov_empty/None_CV.tex
rename to tests/testdata/test_generate_latex_file/sb2nov_empty.tex
diff --git a/tests/testdata/test_generate_latex_file/sb2nov_filled/John_Doe_CV.tex b/tests/testdata/test_generate_latex_file/sb2nov_filled.tex
similarity index 99%
rename from tests/testdata/test_generate_latex_file/sb2nov_filled/John_Doe_CV.tex
rename to tests/testdata/test_generate_latex_file/sb2nov_filled.tex
index 0bf7cd98..d4b9d419 100644
--- a/tests/testdata/test_generate_latex_file/sb2nov_filled/John_Doe_CV.tex
+++ b/tests/testdata/test_generate_latex_file/sb2nov_filled.tex
@@ -230,6 +230,11 @@
             {Software Engineer}{}
 
 
+        \resumeSubheading
+            {Some Company}{Istanbul, Turkey}
+            {Software Engineer}{}
+
+
         \resumeSubheading
             {Some Company}{}
             {Software Engineer}{Sept. 2015 to present}
@@ -256,61 +261,14 @@
 
         \resumeSubheading
             {Some Company}{Istanbul, Turkey}
-            {Software Engineer}{}
-
-
-        \resumeSubheading
-            {Some Company}{}
             {Software Engineer}{Sept. 2015 to present}
 
 
-        \resumeSubheading
-            {Some Company}{}
-            {Software Engineer}{Sept. 2021}
-
-
-        \resumeSubheading
-            {Some Company}{}
-            {Software Engineer}{Sept. 2015 to present}
-            \resumeItemListStart
-                \resumeItem{}{Did this.}
-                \resumeItem{}{Did that.}
-            \resumeItemListEnd
-
-
-        \resumeSubheading
-            {Some Company}{Istanbul, Turkey}
-            {Software Engineer}{Sept. 2015 to present}
-
-
-        \resumeSubheading
-            {Some Company}{}
-            {Software Engineer}{Sept. 2021}
-
-
-        \resumeSubheading
-            {Some Company}{}
-            {Software Engineer}{Jan. 2024}
-            \resumeItemListStart
-                \resumeItem{}{Did this.}
-                \resumeItem{}{Did that.}
-            \resumeItemListEnd
-
-
         \resumeSubheading
             {Some Company}{Istanbul, Turkey}
             {Software Engineer}{Jan. 2024}
 
 
-        \resumeSubheading
-            {Some Company}{}
-            {Software Engineer}{Sept. 2021}
-            \resumeItemListStart
-                \resumeItem{}{Did this.}
-                \resumeItem{}{Did that.}
-            \resumeItemListEnd
-
-
         \resumeSubheading
             {Some Company}{Istanbul, Turkey}
             {Software Engineer}{Sept. 2021}
@@ -325,6 +283,11 @@
             \resumeItemListEnd
 
 
+        \resumeSubheading
+            {Some Company}{}
+            {Software Engineer}{Sept. 2015 to present}
+
+
         \resumeSubheading
             {Some Company}{}
             {Software Engineer}{Sept. 2021}
@@ -340,8 +303,17 @@
 
 
         \resumeSubheading
-            {Some Company}{Istanbul, Turkey}
-            {Software Engineer}{Sept. 2015 to present}
+            {Some Company}{}
+            {Software Engineer}{Sept. 2021}
+
+
+        \resumeSubheading
+            {Some Company}{}
+            {Software Engineer}{Jan. 2024}
+            \resumeItemListStart
+                \resumeItem{}{Did this.}
+                \resumeItem{}{Did that.}
+            \resumeItemListEnd
 
 
         \resumeSubheading
@@ -353,6 +325,11 @@
             \resumeItemListEnd
 
 
+        \resumeSubheading
+            {Some Company}{Istanbul, Turkey}
+            {Software Engineer}{Sept. 2015 to present}
+
+
         \resumeSubheading
             {Some Company}{Istanbul, Turkey}
             {Software Engineer}{Sept. 2021}
@@ -367,15 +344,6 @@
             \resumeItemListEnd
 
 
-        \resumeSubheading
-            {Some Company}{}
-            {Software Engineer}{Sept. 2021}
-            \resumeItemListStart
-                \resumeItem{}{Did this.}
-                \resumeItem{}{Did that.}
-            \resumeItemListEnd
-
-
         \resumeSubheading
             {Some Company}{Istanbul, Turkey}
             {Software Engineer}{Sept. 2021}
@@ -399,6 +367,29 @@
             \resumeItemListEnd
 
 
+        \resumeSubheading
+            {Some Company}{}
+            {Software Engineer}{Sept. 2021}
+
+
+        \resumeSubheading
+            {Some Company}{}
+            {Software Engineer}{Sept. 2015 to present}
+            \resumeItemListStart
+                \resumeItem{}{Did this.}
+                \resumeItem{}{Did that.}
+            \resumeItemListEnd
+
+
+        \resumeSubheading
+            {Some Company}{}
+            {Software Engineer}{Sept. 2021}
+            \resumeItemListStart
+                \resumeItem{}{Did this.}
+                \resumeItem{}{Did that.}
+            \resumeItemListEnd
+
+
         \resumeSubheading
             {Some Company}{}
             {Software Engineer}{Sept. 2021}
@@ -440,6 +431,15 @@
             \resumeItemListEnd
 
 
+        \resumeSubheading
+            {Some Company}{}
+            {Software Engineer}{Sept. 2021}
+            \resumeItemListStart
+                \resumeItem{}{Did this.}
+                \resumeItem{}{Did that.}
+            \resumeItemListEnd
+
+
         \resumeSubheading
             {Some Company}{Istanbul, Turkey}
             {Software Engineer}{Sept. 2021}
@@ -459,6 +459,11 @@
             {Mechanical Engineering}{}
 
 
+        \resumeSubheading
+            {Boğaziçi University}{Istanbul, Turkey}
+            {Mechanical Engineering}{}
+
+
         \resumeSubheading
             {Boğaziçi University}{}
             {Mechanical Engineering}{Sept. 2015 to present}
@@ -483,88 +488,26 @@
             \resumeItemListEnd
 
 
-        \resumeSubheading
-            {Boğaziçi University}{Istanbul, Turkey}
-            {Mechanical Engineering}{}
-
-
         \resumeSubheading
             {Boğaziçi University}{}
             {BS in Mechanical Engineering}{}
 
 
-        \resumeSubheading
-            {Boğaziçi University}{}
-            {Mechanical Engineering}{Sept. 2015 to present}
-
-
-        \resumeSubheading
-            {Boğaziçi University}{}
-            {Mechanical Engineering}{Sept. 2021}
-
-
-        \resumeSubheading
-            {Boğaziçi University}{}
-            {Mechanical Engineering}{Sept. 2015 to present}
-            \resumeItemListStart
-                \resumeItem{}{Did this.}
-                \resumeItem{}{Did that.}
-            \resumeItemListEnd
-
-
         \resumeSubheading
             {Boğaziçi University}{Istanbul, Turkey}
             {Mechanical Engineering}{Sept. 2015 to present}
 
 
-        \resumeSubheading
-            {Boğaziçi University}{}
-            {BS in Mechanical Engineering}{Sept. 2015 to present}
-
-
-        \resumeSubheading
-            {Boğaziçi University}{}
-            {Mechanical Engineering}{Sept. 2021}
-
-
-        \resumeSubheading
-            {Boğaziçi University}{}
-            {Mechanical Engineering}{Jan. 2024}
-            \resumeItemListStart
-                \resumeItem{}{Did this.}
-                \resumeItem{}{Did that.}
-            \resumeItemListEnd
-
-
         \resumeSubheading
             {Boğaziçi University}{Istanbul, Turkey}
             {Mechanical Engineering}{Jan. 2024}
 
 
-        \resumeSubheading
-            {Boğaziçi University}{}
-            {BS in Mechanical Engineering}{Jan. 2024}
-
-
-        \resumeSubheading
-            {Boğaziçi University}{}
-            {Mechanical Engineering}{Sept. 2021}
-            \resumeItemListStart
-                \resumeItem{}{Did this.}
-                \resumeItem{}{Did that.}
-            \resumeItemListEnd
-
-
         \resumeSubheading
             {Boğaziçi University}{Istanbul, Turkey}
             {Mechanical Engineering}{Sept. 2021}
 
 
-        \resumeSubheading
-            {Boğaziçi University}{}
-            {BS in Mechanical Engineering}{Sept. 2021}
-
-
         \resumeSubheading
             {Boğaziçi University}{Istanbul, Turkey}
             {Mechanical Engineering}{}
@@ -574,6 +517,68 @@
             \resumeItemListEnd
 
 
+        \resumeSubheading
+            {Boğaziçi University}{Istanbul, Turkey}
+            {BS in Mechanical Engineering}{}
+
+
+        \resumeSubheading
+            {Boğaziçi University}{}
+            {Mechanical Engineering}{Sept. 2015 to present}
+
+
+        \resumeSubheading
+            {Boğaziçi University}{}
+            {Mechanical Engineering}{Sept. 2021}
+
+
+        \resumeSubheading
+            {Boğaziçi University}{}
+            {Mechanical Engineering}{Sept. 2015 to present}
+            \resumeItemListStart
+                \resumeItem{}{Did this.}
+                \resumeItem{}{Did that.}
+            \resumeItemListEnd
+
+
+        \resumeSubheading
+            {Boğaziçi University}{}
+            {BS in Mechanical Engineering}{Sept. 2015 to present}
+
+
+        \resumeSubheading
+            {Boğaziçi University}{}
+            {Mechanical Engineering}{Sept. 2021}
+
+
+        \resumeSubheading
+            {Boğaziçi University}{}
+            {Mechanical Engineering}{Jan. 2024}
+            \resumeItemListStart
+                \resumeItem{}{Did this.}
+                \resumeItem{}{Did that.}
+            \resumeItemListEnd
+
+
+        \resumeSubheading
+            {Boğaziçi University}{}
+            {BS in Mechanical Engineering}{Jan. 2024}
+
+
+        \resumeSubheading
+            {Boğaziçi University}{}
+            {Mechanical Engineering}{Sept. 2021}
+            \resumeItemListStart
+                \resumeItem{}{Did this.}
+                \resumeItem{}{Did that.}
+            \resumeItemListEnd
+
+
+        \resumeSubheading
+            {Boğaziçi University}{}
+            {BS in Mechanical Engineering}{Sept. 2021}
+
+
         \resumeSubheading
             {Boğaziçi University}{}
             {BS in Mechanical Engineering}{}
@@ -585,40 +590,7 @@
 
         \resumeSubheading
             {Boğaziçi University}{Istanbul, Turkey}
-            {BS in Mechanical Engineering}{}
-
-
-        \resumeSubheading
-            {Boğaziçi University}{}
-            {Mechanical Engineering}{Sept. 2021}
-
-
-        \resumeSubheading
-            {Boğaziçi University}{}
             {Mechanical Engineering}{Sept. 2015 to present}
-            \resumeItemListStart
-                \resumeItem{}{Did this.}
-                \resumeItem{}{Did that.}
-            \resumeItemListEnd
-
-
-        \resumeSubheading
-            {Boğaziçi University}{Istanbul, Turkey}
-            {Mechanical Engineering}{Sept. 2015 to present}
-
-
-        \resumeSubheading
-            {Boğaziçi University}{}
-            {BS in Mechanical Engineering}{Sept. 2015 to present}
-
-
-        \resumeSubheading
-            {Boğaziçi University}{}
-            {Mechanical Engineering}{Sept. 2021}
-            \resumeItemListStart
-                \resumeItem{}{Did this.}
-                \resumeItem{}{Did that.}
-            \resumeItemListEnd
 
 
         \resumeSubheading
@@ -626,11 +598,6 @@
             {Mechanical Engineering}{Sept. 2021}
 
 
-        \resumeSubheading
-            {Boğaziçi University}{}
-            {BS in Mechanical Engineering}{Sept. 2021}
-
-
         \resumeSubheading
             {Boğaziçi University}{Istanbul, Turkey}
             {Mechanical Engineering}{Sept. 2015 to present}
@@ -640,39 +607,16 @@
             \resumeItemListEnd
 
 
-        \resumeSubheading
-            {Boğaziçi University}{}
-            {BS in Mechanical Engineering}{Sept. 2015 to present}
-            \resumeItemListStart
-                \resumeItem{}{Did this.}
-                \resumeItem{}{Did that.}
-            \resumeItemListEnd
-
-
         \resumeSubheading
             {Boğaziçi University}{Istanbul, Turkey}
             {BS in Mechanical Engineering}{Sept. 2015 to present}
 
 
-        \resumeSubheading
-            {Boğaziçi University}{}
-            {Mechanical Engineering}{Sept. 2021}
-            \resumeItemListStart
-                \resumeItem{}{Did this.}
-                \resumeItem{}{Did that.}
-            \resumeItemListEnd
-
-
         \resumeSubheading
             {Boğaziçi University}{Istanbul, Turkey}
             {Mechanical Engineering}{Sept. 2021}
 
 
-        \resumeSubheading
-            {Boğaziçi University}{}
-            {BS in Mechanical Engineering}{Sept. 2021}
-
-
         \resumeSubheading
             {Boğaziçi University}{Istanbul, Turkey}
             {Mechanical Engineering}{Jan. 2024}
@@ -682,15 +626,6 @@
             \resumeItemListEnd
 
 
-        \resumeSubheading
-            {Boğaziçi University}{}
-            {BS in Mechanical Engineering}{Jan. 2024}
-            \resumeItemListStart
-                \resumeItem{}{Did this.}
-                \resumeItem{}{Did that.}
-            \resumeItemListEnd
-
-
         \resumeSubheading
             {Boğaziçi University}{Istanbul, Turkey}
             {BS in Mechanical Engineering}{Jan. 2024}
@@ -705,15 +640,6 @@
             \resumeItemListEnd
 
 
-        \resumeSubheading
-            {Boğaziçi University}{}
-            {BS in Mechanical Engineering}{Sept. 2021}
-            \resumeItemListStart
-                \resumeItem{}{Did this.}
-                \resumeItem{}{Did that.}
-            \resumeItemListEnd
-
-
         \resumeSubheading
             {Boğaziçi University}{Istanbul, Turkey}
             {BS in Mechanical Engineering}{Sept. 2021}
@@ -731,6 +657,71 @@
         \resumeSubheading
             {Boğaziçi University}{}
             {Mechanical Engineering}{Sept. 2021}
+
+
+        \resumeSubheading
+            {Boğaziçi University}{}
+            {Mechanical Engineering}{Sept. 2015 to present}
+            \resumeItemListStart
+                \resumeItem{}{Did this.}
+                \resumeItem{}{Did that.}
+            \resumeItemListEnd
+
+
+        \resumeSubheading
+            {Boğaziçi University}{}
+            {BS in Mechanical Engineering}{Sept. 2015 to present}
+
+
+        \resumeSubheading
+            {Boğaziçi University}{}
+            {Mechanical Engineering}{Sept. 2021}
+            \resumeItemListStart
+                \resumeItem{}{Did this.}
+                \resumeItem{}{Did that.}
+            \resumeItemListEnd
+
+
+        \resumeSubheading
+            {Boğaziçi University}{}
+            {BS in Mechanical Engineering}{Sept. 2021}
+
+
+        \resumeSubheading
+            {Boğaziçi University}{}
+            {BS in Mechanical Engineering}{Sept. 2015 to present}
+            \resumeItemListStart
+                \resumeItem{}{Did this.}
+                \resumeItem{}{Did that.}
+            \resumeItemListEnd
+
+
+        \resumeSubheading
+            {Boğaziçi University}{}
+            {Mechanical Engineering}{Sept. 2021}
+            \resumeItemListStart
+                \resumeItem{}{Did this.}
+                \resumeItem{}{Did that.}
+            \resumeItemListEnd
+
+
+        \resumeSubheading
+            {Boğaziçi University}{}
+            {BS in Mechanical Engineering}{Sept. 2021}
+
+
+        \resumeSubheading
+            {Boğaziçi University}{}
+            {BS in Mechanical Engineering}{Jan. 2024}
+            \resumeItemListStart
+                \resumeItem{}{Did this.}
+                \resumeItem{}{Did that.}
+            \resumeItemListEnd
+
+
+        \resumeSubheading
+            {Boğaziçi University}{}
+            {BS in Mechanical Engineering}{Sept. 2021}
             \resumeItemListStart
                 \resumeItem{}{Did this.}
                 \resumeItem{}{Did that.}
@@ -742,11 +733,6 @@
             {Mechanical Engineering}{Sept. 2021}
 
 
-        \resumeSubheading
-            {Boğaziçi University}{}
-            {BS in Mechanical Engineering}{Sept. 2021}
-
-
         \resumeSubheading
             {Boğaziçi University}{Istanbul, Turkey}
             {Mechanical Engineering}{Sept. 2015 to present}
@@ -756,15 +742,6 @@
             \resumeItemListEnd
 
 
-        \resumeSubheading
-            {Boğaziçi University}{}
-            {BS in Mechanical Engineering}{Sept. 2015 to present}
-            \resumeItemListStart
-                \resumeItem{}{Did this.}
-                \resumeItem{}{Did that.}
-            \resumeItemListEnd
-
-
         \resumeSubheading
             {Boğaziçi University}{Istanbul, Turkey}
             {BS in Mechanical Engineering}{Sept. 2015 to present}
@@ -779,15 +756,6 @@
             \resumeItemListEnd
 
 
-        \resumeSubheading
-            {Boğaziçi University}{}
-            {BS in Mechanical Engineering}{Sept. 2021}
-            \resumeItemListStart
-                \resumeItem{}{Did this.}
-                \resumeItem{}{Did that.}
-            \resumeItemListEnd
-
-
         \resumeSubheading
             {Boğaziçi University}{Istanbul, Turkey}
             {BS in Mechanical Engineering}{Sept. 2021}
@@ -811,15 +779,6 @@
             \resumeItemListEnd
 
 
-        \resumeSubheading
-            {Boğaziçi University}{}
-            {BS in Mechanical Engineering}{Sept. 2021}
-            \resumeItemListStart
-                \resumeItem{}{Did this.}
-                \resumeItem{}{Did that.}
-            \resumeItemListEnd
-
-
         \resumeSubheading
             {Boğaziçi University}{Istanbul, Turkey}
             {BS in Mechanical Engineering}{Sept. 2021}
@@ -844,7 +803,7 @@
 
 
         \resumeSubheading
-            {Boğaziçi University}{Istanbul, Turkey}
+            {Boğaziçi University}{}
             {Mechanical Engineering}{Sept. 2021}
             \resumeItemListStart
                 \resumeItem{}{Did this.}
@@ -855,6 +814,38 @@
         \resumeSubheading
             {Boğaziçi University}{}
             {BS in Mechanical Engineering}{Sept. 2021}
+
+
+        \resumeSubheading
+            {Boğaziçi University}{}
+            {BS in Mechanical Engineering}{Sept. 2015 to present}
+            \resumeItemListStart
+                \resumeItem{}{Did this.}
+                \resumeItem{}{Did that.}
+            \resumeItemListEnd
+
+
+        \resumeSubheading
+            {Boğaziçi University}{}
+            {BS in Mechanical Engineering}{Sept. 2021}
+            \resumeItemListStart
+                \resumeItem{}{Did this.}
+                \resumeItem{}{Did that.}
+            \resumeItemListEnd
+
+
+        \resumeSubheading
+            {Boğaziçi University}{}
+            {BS in Mechanical Engineering}{Sept. 2021}
+            \resumeItemListStart
+                \resumeItem{}{Did this.}
+                \resumeItem{}{Did that.}
+            \resumeItemListEnd
+
+
+        \resumeSubheading
+            {Boğaziçi University}{Istanbul, Turkey}
+            {Mechanical Engineering}{Sept. 2021}
             \resumeItemListStart
                 \resumeItem{}{Did this.}
                 \resumeItem{}{Did that.}
@@ -893,6 +884,15 @@
             \resumeItemListEnd
 
 
+        \resumeSubheading
+            {Boğaziçi University}{}
+            {BS in Mechanical Engineering}{Sept. 2021}
+            \resumeItemListStart
+                \resumeItem{}{Did this.}
+                \resumeItem{}{Did that.}
+            \resumeItemListEnd
+
+
         \resumeSubheading
             {Boğaziçi University}{Istanbul, Turkey}
             {BS in Mechanical Engineering}{Sept. 2021}
@@ -911,6 +911,10 @@
             {My Project}{}
 
 
+        \resumeNormalSubheading
+            {My Project}{Istanbul, Turkey}
+
+
         \resumeNormalSubheading
             {My Project}{Sept. 2015 to present}
 
@@ -931,52 +935,12 @@
             \resumeItemListEnd
 
 
-        \resumeNormalSubheading
-            {My Project}{Istanbul, Turkey}
-
-
         \resumeNormalSubheading
             {My Project}{Sept. 2015 to present}
 
 
-        \resumeNormalSubheading
-            {My Project}{Sept. 2021}
-
-
-        \resumeNormalSubheading
-            {My Project}{Sept. 2015 to present}
-            \resumeItemListStart
-                \resumeItem{}{Did this.}
-                \resumeItem{}{Did that.}
-            \resumeItemListEnd
-
-
-        \resumeNormalSubheading
-            {My Project}{Sept. 2015 to present}
-
-
-        \resumeNormalSubheading
-            {My Project}{Sept. 2021}
-
-
         \resumeNormalSubheading
             {My Project}{Jan. 2024}
-            \resumeItemListStart
-                \resumeItem{}{Did this.}
-                \resumeItem{}{Did that.}
-            \resumeItemListEnd
-
-
-        \resumeNormalSubheading
-            {My Project}{Jan. 2024}
-
-
-        \resumeNormalSubheading
-            {My Project}{Sept. 2021}
-            \resumeItemListStart
-                \resumeItem{}{Did this.}
-                \resumeItem{}{Did that.}
-            \resumeItemListEnd
 
 
         \resumeNormalSubheading
@@ -991,28 +955,8 @@
             \resumeItemListEnd
 
 
-        \resumeNormalSubheading
-            {My Project}{Sept. 2021}
-
-
         \resumeNormalSubheading
             {My Project}{Sept. 2015 to present}
-            \resumeItemListStart
-                \resumeItem{}{Did this.}
-                \resumeItem{}{Did that.}
-            \resumeItemListEnd
-
-
-        \resumeNormalSubheading
-            {My Project}{Sept. 2015 to present}
-
-
-        \resumeNormalSubheading
-            {My Project}{Sept. 2021}
-            \resumeItemListStart
-                \resumeItem{}{Did this.}
-                \resumeItem{}{Did that.}
-            \resumeItemListEnd
 
 
         \resumeNormalSubheading
@@ -1029,6 +973,34 @@
 
         \resumeNormalSubheading
             {My Project}{Sept. 2021}
+
+
+        \resumeNormalSubheading
+            {My Project}{Jan. 2024}
+            \resumeItemListStart
+                \resumeItem{}{Did this.}
+                \resumeItem{}{Did that.}
+            \resumeItemListEnd
+
+
+        \resumeNormalSubheading
+            {My Project}{Sept. 2021}
+            \resumeItemListStart
+                \resumeItem{}{Did this.}
+                \resumeItem{}{Did that.}
+            \resumeItemListEnd
+
+
+        \resumeNormalSubheading
+            {My Project}{Sept. 2015 to present}
+
+
+        \resumeNormalSubheading
+            {My Project}{Sept. 2021}
+
+
+        \resumeNormalSubheading
+            {My Project}{Sept. 2015 to present}
             \resumeItemListStart
                 \resumeItem{}{Did this.}
                 \resumeItem{}{Did that.}
@@ -1055,6 +1027,26 @@
             \resumeItemListEnd
 
 
+        \resumeNormalSubheading
+            {My Project}{Sept. 2021}
+
+
+        \resumeNormalSubheading
+            {My Project}{Sept. 2015 to present}
+            \resumeItemListStart
+                \resumeItem{}{Did this.}
+                \resumeItem{}{Did that.}
+            \resumeItemListEnd
+
+
+        \resumeNormalSubheading
+            {My Project}{Sept. 2021}
+            \resumeItemListStart
+                \resumeItem{}{Did this.}
+                \resumeItem{}{Did that.}
+            \resumeItemListEnd
+
+
         \resumeNormalSubheading
             {My Project}{Sept. 2021}
             \resumeItemListStart
@@ -1099,6 +1091,14 @@
             \resumeItemListEnd
 
 
+        \resumeNormalSubheading
+            {My Project}{Sept. 2021}
+            \resumeItemListStart
+                \resumeItem{}{Did this.}
+                \resumeItem{}{Did that.}
+            \resumeItemListEnd
+
+
 
     \resumeSubHeadingListEnd
     \section{One Line Entries}
diff --git a/tests/testdata/test_generate_latex_file_and_copy_theme_files/classic_filled/John_Doe_CV.tex b/tests/testdata/test_generate_latex_file_and_copy_theme_files/classic_filled/John_Doe_CV.tex
index 42d31d4e..51501434 100644
--- a/tests/testdata/test_generate_latex_file_and_copy_theme_files/classic_filled/John_Doe_CV.tex
+++ b/tests/testdata/test_generate_latex_file_and_copy_theme_files/classic_filled/John_Doe_CV.tex
@@ -268,6 +268,23 @@
             
 
             
+        \end{tabularx}
+
+        \vspace{0.2 cm}
+        \begin{tabularx}{
+            \textwidth-0.4 cm-0.13cm
+        }{
+            K{0.2 cm}
+            R{4.1 cm}
+        }
+            \textbf{Some Company}, Software Engineer
+
+            \vspace{0.10 cm}
+
+            &
+            Istanbul, Turkey
+
+            
         \end{tabularx}
 
         \vspace{0.2 cm}
@@ -356,6 +373,61 @@
             &
             Istanbul, Turkey
 
+            Sept. 2015 to present
+        \end{tabularx}
+
+        \vspace{0.2 cm}
+        \begin{tabularx}{
+            \textwidth-0.4 cm-0.13cm
+        }{
+            K{0.2 cm}
+            R{4.1 cm}
+        }
+            \textbf{Some Company}, Software Engineer
+
+            \vspace{0.10 cm}
+
+            &
+            Istanbul, Turkey
+
+            Jan. 2024
+        \end{tabularx}
+
+        \vspace{0.2 cm}
+        \begin{tabularx}{
+            \textwidth-0.4 cm-0.13cm
+        }{
+            K{0.2 cm}
+            R{4.1 cm}
+        }
+            \textbf{Some Company}, Software Engineer
+
+            \vspace{0.10 cm}
+
+            &
+            Istanbul, Turkey
+
+            Sept. 2021
+        \end{tabularx}
+
+        \vspace{0.2 cm}
+        \begin{tabularx}{
+            \textwidth-0.4 cm-0.13cm
+        }{
+            K{0.2 cm}
+            R{4.1 cm}
+        }
+            \textbf{Some Company}, Software Engineer
+
+            \vspace{0.10 cm}
+
+            \begin{highlights}
+                \item Did this.
+                \item Did that.
+            \end{highlights}
+            &
+            Istanbul, Turkey
+
             
         \end{tabularx}
 
@@ -414,23 +486,6 @@
             Sept. 2015 to present
         \end{tabularx}
 
-        \vspace{0.2 cm}
-        \begin{tabularx}{
-            \textwidth-0.4 cm-0.13cm
-        }{
-            K{0.2 cm}
-            R{4.1 cm}
-        }
-            \textbf{Some Company}, Software Engineer
-
-            \vspace{0.10 cm}
-
-            &
-            Istanbul, Turkey
-
-            Sept. 2015 to present
-        \end{tabularx}
-
         \vspace{0.2 cm}
         \begin{tabularx}{
             \textwidth-0.4 cm-0.13cm
@@ -469,23 +524,6 @@
             Jan. 2024
         \end{tabularx}
 
-        \vspace{0.2 cm}
-        \begin{tabularx}{
-            \textwidth-0.4 cm-0.13cm
-        }{
-            K{0.2 cm}
-            R{4.1 cm}
-        }
-            \textbf{Some Company}, Software Engineer
-
-            \vspace{0.10 cm}
-
-            &
-            Istanbul, Turkey
-
-            Jan. 2024
-        \end{tabularx}
-
         \vspace{0.2 cm}
         \begin{tabularx}{
             \textwidth-0.4 cm-0.13cm
@@ -507,82 +545,6 @@
             Sept. 2021
         \end{tabularx}
 
-        \vspace{0.2 cm}
-        \begin{tabularx}{
-            \textwidth-0.4 cm-0.13cm
-        }{
-            K{0.2 cm}
-            R{4.1 cm}
-        }
-            \textbf{Some Company}, Software Engineer
-
-            \vspace{0.10 cm}
-
-            &
-            Istanbul, Turkey
-
-            Sept. 2021
-        \end{tabularx}
-
-        \vspace{0.2 cm}
-        \begin{tabularx}{
-            \textwidth-0.4 cm-0.13cm
-        }{
-            K{0.2 cm}
-            R{4.1 cm}
-        }
-            \textbf{Some Company}, Software Engineer
-
-            \vspace{0.10 cm}
-
-            \begin{highlights}
-                \item Did this.
-                \item Did that.
-            \end{highlights}
-            &
-            Istanbul, Turkey
-
-            
-        \end{tabularx}
-
-        \vspace{0.2 cm}
-        \begin{tabularx}{
-            \textwidth-0.4 cm-0.13cm
-        }{
-            K{0.2 cm}
-            R{4.1 cm}
-        }
-            \textbf{Some Company}, Software Engineer
-
-            \vspace{0.10 cm}
-
-            &
-            
-
-            Sept. 2021
-        \end{tabularx}
-
-        \vspace{0.2 cm}
-        \begin{tabularx}{
-            \textwidth-0.4 cm-0.13cm
-        }{
-            K{0.2 cm}
-            R{4.1 cm}
-        }
-            \textbf{Some Company}, Software Engineer
-
-            \vspace{0.10 cm}
-
-            \begin{highlights}
-                \item Did this.
-                \item Did that.
-            \end{highlights}
-            &
-            
-
-            Sept. 2015 to present
-        \end{tabularx}
-
         \vspace{0.2 cm}
         \begin{tabularx}{
             \textwidth-0.4 cm-0.13cm
@@ -600,27 +562,6 @@
             Sept. 2015 to present
         \end{tabularx}
 
-        \vspace{0.2 cm}
-        \begin{tabularx}{
-            \textwidth-0.4 cm-0.13cm
-        }{
-            K{0.2 cm}
-            R{4.1 cm}
-        }
-            \textbf{Some Company}, Software Engineer
-
-            \vspace{0.10 cm}
-
-            \begin{highlights}
-                \item Did this.
-                \item Did that.
-            \end{highlights}
-            &
-            
-
-            Sept. 2021
-        \end{tabularx}
-
         \vspace{0.2 cm}
         \begin{tabularx}{
             \textwidth-0.4 cm-0.13cm
@@ -659,27 +600,6 @@
             Sept. 2015 to present
         \end{tabularx}
 
-        \vspace{0.2 cm}
-        \begin{tabularx}{
-            \textwidth-0.4 cm-0.13cm
-        }{
-            K{0.2 cm}
-            R{4.1 cm}
-        }
-            \textbf{Some Company}, Software Engineer
-
-            \vspace{0.10 cm}
-
-            \begin{highlights}
-                \item Did this.
-                \item Did that.
-            \end{highlights}
-            &
-            
-
-            Sept. 2021
-        \end{tabularx}
-
         \vspace{0.2 cm}
         \begin{tabularx}{
             \textwidth-0.4 cm-0.13cm
@@ -739,6 +659,65 @@
             Sept. 2021
         \end{tabularx}
 
+        \vspace{0.2 cm}
+        \begin{tabularx}{
+            \textwidth-0.4 cm-0.13cm
+        }{
+            K{0.2 cm}
+            R{4.1 cm}
+        }
+            \textbf{Some Company}, Software Engineer
+
+            \vspace{0.10 cm}
+
+            &
+            
+
+            Sept. 2021
+        \end{tabularx}
+
+        \vspace{0.2 cm}
+        \begin{tabularx}{
+            \textwidth-0.4 cm-0.13cm
+        }{
+            K{0.2 cm}
+            R{4.1 cm}
+        }
+            \textbf{Some Company}, Software Engineer
+
+            \vspace{0.10 cm}
+
+            \begin{highlights}
+                \item Did this.
+                \item Did that.
+            \end{highlights}
+            &
+            
+
+            Sept. 2015 to present
+        \end{tabularx}
+
+        \vspace{0.2 cm}
+        \begin{tabularx}{
+            \textwidth-0.4 cm-0.13cm
+        }{
+            K{0.2 cm}
+            R{4.1 cm}
+        }
+            \textbf{Some Company}, Software Engineer
+
+            \vspace{0.10 cm}
+
+            \begin{highlights}
+                \item Did this.
+                \item Did that.
+            \end{highlights}
+            &
+            
+
+            Sept. 2021
+        \end{tabularx}
+
         \vspace{0.2 cm}
         \begin{tabularx}{
             \textwidth-0.4 cm-0.13cm
@@ -840,6 +819,27 @@
             Sept. 2021
         \end{tabularx}
 
+        \vspace{0.2 cm}
+        \begin{tabularx}{
+            \textwidth-0.4 cm-0.13cm
+        }{
+            K{0.2 cm}
+            R{4.1 cm}
+        }
+            \textbf{Some Company}, Software Engineer
+
+            \vspace{0.10 cm}
+
+            \begin{highlights}
+                \item Did this.
+                \item Did that.
+            \end{highlights}
+            &
+            
+
+            Sept. 2021
+        \end{tabularx}
+
         \vspace{0.2 cm}
         \begin{tabularx}{
             \textwidth-0.4 cm-0.13cm
@@ -882,6 +882,26 @@
             
 
             
+        \end{tabularx}
+
+        \vspace{0.2 cm}
+        \begin{tabularx}{
+            \textwidth-0.4 cm-0.13cm
+        }{
+            L{0.85cm}
+            K{0.2 cm}
+            R{4.1 cm}
+        }
+            \textbf{}
+            &
+            \textbf{Boğaziçi University}, Mechanical Engineering
+
+            \vspace{0.10 cm}
+
+            &
+            Istanbul, Turkey
+
+            
         \end{tabularx}
 
         \vspace{0.2 cm}
@@ -966,6 +986,26 @@
             
 
             
+        \end{tabularx}
+
+        \vspace{0.2 cm}
+        \begin{tabularx}{
+            \textwidth-0.4 cm-0.13cm
+        }{
+            L{0.85cm}
+            K{0.2 cm}
+            R{4.1 cm}
+        }
+            \textbf{BS}
+            &
+            \textbf{Boğaziçi University}, Mechanical Engineering
+
+            \vspace{0.10 cm}
+
+            &
+            
+
+            
         \end{tabularx}
 
         \vspace{0.2 cm}
@@ -985,6 +1025,70 @@
             &
             Istanbul, Turkey
 
+            Sept. 2015 to present
+        \end{tabularx}
+
+        \vspace{0.2 cm}
+        \begin{tabularx}{
+            \textwidth-0.4 cm-0.13cm
+        }{
+            L{0.85cm}
+            K{0.2 cm}
+            R{4.1 cm}
+        }
+            \textbf{}
+            &
+            \textbf{Boğaziçi University}, Mechanical Engineering
+
+            \vspace{0.10 cm}
+
+            &
+            Istanbul, Turkey
+
+            Jan. 2024
+        \end{tabularx}
+
+        \vspace{0.2 cm}
+        \begin{tabularx}{
+            \textwidth-0.4 cm-0.13cm
+        }{
+            L{0.85cm}
+            K{0.2 cm}
+            R{4.1 cm}
+        }
+            \textbf{}
+            &
+            \textbf{Boğaziçi University}, Mechanical Engineering
+
+            \vspace{0.10 cm}
+
+            &
+            Istanbul, Turkey
+
+            Sept. 2021
+        \end{tabularx}
+
+        \vspace{0.2 cm}
+        \begin{tabularx}{
+            \textwidth-0.4 cm-0.13cm
+        }{
+            L{0.85cm}
+            K{0.2 cm}
+            R{4.1 cm}
+        }
+            \textbf{}
+            &
+            \textbf{Boğaziçi University}, Mechanical Engineering
+
+            \vspace{0.10 cm}
+
+            \begin{highlights}
+                \item Did this.
+                \item Did that.
+            \end{highlights}
+            &
+            Istanbul, Turkey
+
             
         \end{tabularx}
 
@@ -1003,7 +1107,7 @@
             \vspace{0.10 cm}
 
             &
-            
+            Istanbul, Turkey
 
             
         \end{tabularx}
@@ -1072,26 +1176,6 @@
             Sept. 2015 to present
         \end{tabularx}
 
-        \vspace{0.2 cm}
-        \begin{tabularx}{
-            \textwidth-0.4 cm-0.13cm
-        }{
-            L{0.85cm}
-            K{0.2 cm}
-            R{4.1 cm}
-        }
-            \textbf{}
-            &
-            \textbf{Boğaziçi University}, Mechanical Engineering
-
-            \vspace{0.10 cm}
-
-            &
-            Istanbul, Turkey
-
-            Sept. 2015 to present
-        \end{tabularx}
-
         \vspace{0.2 cm}
         \begin{tabularx}{
             \textwidth-0.4 cm-0.13cm
@@ -1156,26 +1240,6 @@
             Jan. 2024
         \end{tabularx}
 
-        \vspace{0.2 cm}
-        \begin{tabularx}{
-            \textwidth-0.4 cm-0.13cm
-        }{
-            L{0.85cm}
-            K{0.2 cm}
-            R{4.1 cm}
-        }
-            \textbf{}
-            &
-            \textbf{Boğaziçi University}, Mechanical Engineering
-
-            \vspace{0.10 cm}
-
-            &
-            Istanbul, Turkey
-
-            Jan. 2024
-        \end{tabularx}
-
         \vspace{0.2 cm}
         \begin{tabularx}{
             \textwidth-0.4 cm-0.13cm
@@ -1220,26 +1284,6 @@
             Sept. 2021
         \end{tabularx}
 
-        \vspace{0.2 cm}
-        \begin{tabularx}{
-            \textwidth-0.4 cm-0.13cm
-        }{
-            L{0.85cm}
-            K{0.2 cm}
-            R{4.1 cm}
-        }
-            \textbf{}
-            &
-            \textbf{Boğaziçi University}, Mechanical Engineering
-
-            \vspace{0.10 cm}
-
-            &
-            Istanbul, Turkey
-
-            Sept. 2021
-        \end{tabularx}
-
         \vspace{0.2 cm}
         \begin{tabularx}{
             \textwidth-0.4 cm-0.13cm
@@ -1260,30 +1304,6 @@
             Sept. 2021
         \end{tabularx}
 
-        \vspace{0.2 cm}
-        \begin{tabularx}{
-            \textwidth-0.4 cm-0.13cm
-        }{
-            L{0.85cm}
-            K{0.2 cm}
-            R{4.1 cm}
-        }
-            \textbf{}
-            &
-            \textbf{Boğaziçi University}, Mechanical Engineering
-
-            \vspace{0.10 cm}
-
-            \begin{highlights}
-                \item Did this.
-                \item Did that.
-            \end{highlights}
-            &
-            Istanbul, Turkey
-
-            
-        \end{tabularx}
-
         \vspace{0.2 cm}
         \begin{tabularx}{
             \textwidth-0.4 cm-0.13cm
@@ -1308,70 +1328,6 @@
             
         \end{tabularx}
 
-        \vspace{0.2 cm}
-        \begin{tabularx}{
-            \textwidth-0.4 cm-0.13cm
-        }{
-            L{0.85cm}
-            K{0.2 cm}
-            R{4.1 cm}
-        }
-            \textbf{BS}
-            &
-            \textbf{Boğaziçi University}, Mechanical Engineering
-
-            \vspace{0.10 cm}
-
-            &
-            Istanbul, Turkey
-
-            
-        \end{tabularx}
-
-        \vspace{0.2 cm}
-        \begin{tabularx}{
-            \textwidth-0.4 cm-0.13cm
-        }{
-            L{0.85cm}
-            K{0.2 cm}
-            R{4.1 cm}
-        }
-            \textbf{}
-            &
-            \textbf{Boğaziçi University}, Mechanical Engineering
-
-            \vspace{0.10 cm}
-
-            &
-            
-
-            Sept. 2021
-        \end{tabularx}
-
-        \vspace{0.2 cm}
-        \begin{tabularx}{
-            \textwidth-0.4 cm-0.13cm
-        }{
-            L{0.85cm}
-            K{0.2 cm}
-            R{4.1 cm}
-        }
-            \textbf{}
-            &
-            \textbf{Boğaziçi University}, Mechanical Engineering
-
-            \vspace{0.10 cm}
-
-            \begin{highlights}
-                \item Did this.
-                \item Did that.
-            \end{highlights}
-            &
-            
-
-            Sept. 2015 to present
-        \end{tabularx}
-
         \vspace{0.2 cm}
         \begin{tabularx}{
             \textwidth-0.4 cm-0.13cm
@@ -1392,50 +1348,6 @@
             Sept. 2015 to present
         \end{tabularx}
 
-        \vspace{0.2 cm}
-        \begin{tabularx}{
-            \textwidth-0.4 cm-0.13cm
-        }{
-            L{0.85cm}
-            K{0.2 cm}
-            R{4.1 cm}
-        }
-            \textbf{BS}
-            &
-            \textbf{Boğaziçi University}, Mechanical Engineering
-
-            \vspace{0.10 cm}
-
-            &
-            
-
-            Sept. 2015 to present
-        \end{tabularx}
-
-        \vspace{0.2 cm}
-        \begin{tabularx}{
-            \textwidth-0.4 cm-0.13cm
-        }{
-            L{0.85cm}
-            K{0.2 cm}
-            R{4.1 cm}
-        }
-            \textbf{}
-            &
-            \textbf{Boğaziçi University}, Mechanical Engineering
-
-            \vspace{0.10 cm}
-
-            \begin{highlights}
-                \item Did this.
-                \item Did that.
-            \end{highlights}
-            &
-            
-
-            Sept. 2021
-        \end{tabularx}
-
         \vspace{0.2 cm}
         \begin{tabularx}{
             \textwidth-0.4 cm-0.13cm
@@ -1456,26 +1368,6 @@
             Sept. 2021
         \end{tabularx}
 
-        \vspace{0.2 cm}
-        \begin{tabularx}{
-            \textwidth-0.4 cm-0.13cm
-        }{
-            L{0.85cm}
-            K{0.2 cm}
-            R{4.1 cm}
-        }
-            \textbf{BS}
-            &
-            \textbf{Boğaziçi University}, Mechanical Engineering
-
-            \vspace{0.10 cm}
-
-            &
-            
-
-            Sept. 2021
-        \end{tabularx}
-
         \vspace{0.2 cm}
         \begin{tabularx}{
             \textwidth-0.4 cm-0.13cm
@@ -1500,30 +1392,6 @@
             Sept. 2015 to present
         \end{tabularx}
 
-        \vspace{0.2 cm}
-        \begin{tabularx}{
-            \textwidth-0.4 cm-0.13cm
-        }{
-            L{0.85cm}
-            K{0.2 cm}
-            R{4.1 cm}
-        }
-            \textbf{BS}
-            &
-            \textbf{Boğaziçi University}, Mechanical Engineering
-
-            \vspace{0.10 cm}
-
-            \begin{highlights}
-                \item Did this.
-                \item Did that.
-            \end{highlights}
-            &
-            
-
-            Sept. 2015 to present
-        \end{tabularx}
-
         \vspace{0.2 cm}
         \begin{tabularx}{
             \textwidth-0.4 cm-0.13cm
@@ -1544,30 +1412,6 @@
             Sept. 2015 to present
         \end{tabularx}
 
-        \vspace{0.2 cm}
-        \begin{tabularx}{
-            \textwidth-0.4 cm-0.13cm
-        }{
-            L{0.85cm}
-            K{0.2 cm}
-            R{4.1 cm}
-        }
-            \textbf{}
-            &
-            \textbf{Boğaziçi University}, Mechanical Engineering
-
-            \vspace{0.10 cm}
-
-            \begin{highlights}
-                \item Did this.
-                \item Did that.
-            \end{highlights}
-            &
-            
-
-            Sept. 2021
-        \end{tabularx}
-
         \vspace{0.2 cm}
         \begin{tabularx}{
             \textwidth-0.4 cm-0.13cm
@@ -1588,26 +1432,6 @@
             Sept. 2021
         \end{tabularx}
 
-        \vspace{0.2 cm}
-        \begin{tabularx}{
-            \textwidth-0.4 cm-0.13cm
-        }{
-            L{0.85cm}
-            K{0.2 cm}
-            R{4.1 cm}
-        }
-            \textbf{BS}
-            &
-            \textbf{Boğaziçi University}, Mechanical Engineering
-
-            \vspace{0.10 cm}
-
-            &
-            
-
-            Sept. 2021
-        \end{tabularx}
-
         \vspace{0.2 cm}
         \begin{tabularx}{
             \textwidth-0.4 cm-0.13cm
@@ -1632,30 +1456,6 @@
             Jan. 2024
         \end{tabularx}
 
-        \vspace{0.2 cm}
-        \begin{tabularx}{
-            \textwidth-0.4 cm-0.13cm
-        }{
-            L{0.85cm}
-            K{0.2 cm}
-            R{4.1 cm}
-        }
-            \textbf{BS}
-            &
-            \textbf{Boğaziçi University}, Mechanical Engineering
-
-            \vspace{0.10 cm}
-
-            \begin{highlights}
-                \item Did this.
-                \item Did that.
-            \end{highlights}
-            &
-            
-
-            Jan. 2024
-        \end{tabularx}
-
         \vspace{0.2 cm}
         \begin{tabularx}{
             \textwidth-0.4 cm-0.13cm
@@ -1700,30 +1500,6 @@
             Sept. 2021
         \end{tabularx}
 
-        \vspace{0.2 cm}
-        \begin{tabularx}{
-            \textwidth-0.4 cm-0.13cm
-        }{
-            L{0.85cm}
-            K{0.2 cm}
-            R{4.1 cm}
-        }
-            \textbf{BS}
-            &
-            \textbf{Boğaziçi University}, Mechanical Engineering
-
-            \vspace{0.10 cm}
-
-            \begin{highlights}
-                \item Did this.
-                \item Did that.
-            \end{highlights}
-            &
-            
-
-            Sept. 2021
-        \end{tabularx}
-
         \vspace{0.2 cm}
         \begin{tabularx}{
             \textwidth-0.4 cm-0.13cm
@@ -1782,50 +1558,6 @@
 
             \vspace{0.10 cm}
 
-            \begin{highlights}
-                \item Did this.
-                \item Did that.
-            \end{highlights}
-            &
-            
-
-            Sept. 2021
-        \end{tabularx}
-
-        \vspace{0.2 cm}
-        \begin{tabularx}{
-            \textwidth-0.4 cm-0.13cm
-        }{
-            L{0.85cm}
-            K{0.2 cm}
-            R{4.1 cm}
-        }
-            \textbf{}
-            &
-            \textbf{Boğaziçi University}, Mechanical Engineering
-
-            \vspace{0.10 cm}
-
-            &
-            Istanbul, Turkey
-
-            Sept. 2021
-        \end{tabularx}
-
-        \vspace{0.2 cm}
-        \begin{tabularx}{
-            \textwidth-0.4 cm-0.13cm
-        }{
-            L{0.85cm}
-            K{0.2 cm}
-            R{4.1 cm}
-        }
-            \textbf{BS}
-            &
-            \textbf{Boğaziçi University}, Mechanical Engineering
-
-            \vspace{0.10 cm}
-
             &
             
 
@@ -1851,7 +1583,7 @@
                 \item Did that.
             \end{highlights}
             &
-            Istanbul, Turkey
+            
 
             Sept. 2015 to present
         \end{tabularx}
@@ -1870,6 +1602,26 @@
 
             \vspace{0.10 cm}
 
+            &
+            
+
+            Sept. 2015 to present
+        \end{tabularx}
+
+        \vspace{0.2 cm}
+        \begin{tabularx}{
+            \textwidth-0.4 cm-0.13cm
+        }{
+            L{0.85cm}
+            K{0.2 cm}
+            R{4.1 cm}
+        }
+            \textbf{}
+            &
+            \textbf{Boğaziçi University}, Mechanical Engineering
+
+            \vspace{0.10 cm}
+
             \begin{highlights}
                 \item Did this.
                 \item Did that.
@@ -1877,6 +1629,186 @@
             &
             
 
+            Sept. 2021
+        \end{tabularx}
+
+        \vspace{0.2 cm}
+        \begin{tabularx}{
+            \textwidth-0.4 cm-0.13cm
+        }{
+            L{0.85cm}
+            K{0.2 cm}
+            R{4.1 cm}
+        }
+            \textbf{BS}
+            &
+            \textbf{Boğaziçi University}, Mechanical Engineering
+
+            \vspace{0.10 cm}
+
+            &
+            
+
+            Sept. 2021
+        \end{tabularx}
+
+        \vspace{0.2 cm}
+        \begin{tabularx}{
+            \textwidth-0.4 cm-0.13cm
+        }{
+            L{0.85cm}
+            K{0.2 cm}
+            R{4.1 cm}
+        }
+            \textbf{BS}
+            &
+            \textbf{Boğaziçi University}, Mechanical Engineering
+
+            \vspace{0.10 cm}
+
+            \begin{highlights}
+                \item Did this.
+                \item Did that.
+            \end{highlights}
+            &
+            
+
+            Sept. 2015 to present
+        \end{tabularx}
+
+        \vspace{0.2 cm}
+        \begin{tabularx}{
+            \textwidth-0.4 cm-0.13cm
+        }{
+            L{0.85cm}
+            K{0.2 cm}
+            R{4.1 cm}
+        }
+            \textbf{}
+            &
+            \textbf{Boğaziçi University}, Mechanical Engineering
+
+            \vspace{0.10 cm}
+
+            \begin{highlights}
+                \item Did this.
+                \item Did that.
+            \end{highlights}
+            &
+            
+
+            Sept. 2021
+        \end{tabularx}
+
+        \vspace{0.2 cm}
+        \begin{tabularx}{
+            \textwidth-0.4 cm-0.13cm
+        }{
+            L{0.85cm}
+            K{0.2 cm}
+            R{4.1 cm}
+        }
+            \textbf{BS}
+            &
+            \textbf{Boğaziçi University}, Mechanical Engineering
+
+            \vspace{0.10 cm}
+
+            &
+            
+
+            Sept. 2021
+        \end{tabularx}
+
+        \vspace{0.2 cm}
+        \begin{tabularx}{
+            \textwidth-0.4 cm-0.13cm
+        }{
+            L{0.85cm}
+            K{0.2 cm}
+            R{4.1 cm}
+        }
+            \textbf{BS}
+            &
+            \textbf{Boğaziçi University}, Mechanical Engineering
+
+            \vspace{0.10 cm}
+
+            \begin{highlights}
+                \item Did this.
+                \item Did that.
+            \end{highlights}
+            &
+            
+
+            Jan. 2024
+        \end{tabularx}
+
+        \vspace{0.2 cm}
+        \begin{tabularx}{
+            \textwidth-0.4 cm-0.13cm
+        }{
+            L{0.85cm}
+            K{0.2 cm}
+            R{4.1 cm}
+        }
+            \textbf{BS}
+            &
+            \textbf{Boğaziçi University}, Mechanical Engineering
+
+            \vspace{0.10 cm}
+
+            \begin{highlights}
+                \item Did this.
+                \item Did that.
+            \end{highlights}
+            &
+            
+
+            Sept. 2021
+        \end{tabularx}
+
+        \vspace{0.2 cm}
+        \begin{tabularx}{
+            \textwidth-0.4 cm-0.13cm
+        }{
+            L{0.85cm}
+            K{0.2 cm}
+            R{4.1 cm}
+        }
+            \textbf{}
+            &
+            \textbf{Boğaziçi University}, Mechanical Engineering
+
+            \vspace{0.10 cm}
+
+            &
+            Istanbul, Turkey
+
+            Sept. 2021
+        \end{tabularx}
+
+        \vspace{0.2 cm}
+        \begin{tabularx}{
+            \textwidth-0.4 cm-0.13cm
+        }{
+            L{0.85cm}
+            K{0.2 cm}
+            R{4.1 cm}
+        }
+            \textbf{}
+            &
+            \textbf{Boğaziçi University}, Mechanical Engineering
+
+            \vspace{0.10 cm}
+
+            \begin{highlights}
+                \item Did this.
+                \item Did that.
+            \end{highlights}
+            &
+            Istanbul, Turkey
+
             Sept. 2015 to present
         \end{tabularx}
 
@@ -1924,30 +1856,6 @@
             Sept. 2021
         \end{tabularx}
 
-        \vspace{0.2 cm}
-        \begin{tabularx}{
-            \textwidth-0.4 cm-0.13cm
-        }{
-            L{0.85cm}
-            K{0.2 cm}
-            R{4.1 cm}
-        }
-            \textbf{BS}
-            &
-            \textbf{Boğaziçi University}, Mechanical Engineering
-
-            \vspace{0.10 cm}
-
-            \begin{highlights}
-                \item Did this.
-                \item Did that.
-            \end{highlights}
-            &
-            
-
-            Sept. 2021
-        \end{tabularx}
-
         \vspace{0.2 cm}
         \begin{tabularx}{
             \textwidth-0.4 cm-0.13cm
@@ -2016,30 +1924,6 @@
             Sept. 2021
         \end{tabularx}
 
-        \vspace{0.2 cm}
-        \begin{tabularx}{
-            \textwidth-0.4 cm-0.13cm
-        }{
-            L{0.85cm}
-            K{0.2 cm}
-            R{4.1 cm}
-        }
-            \textbf{BS}
-            &
-            \textbf{Boğaziçi University}, Mechanical Engineering
-
-            \vspace{0.10 cm}
-
-            \begin{highlights}
-                \item Did this.
-                \item Did that.
-            \end{highlights}
-            &
-            
-
-            Sept. 2021
-        \end{tabularx}
-
         \vspace{0.2 cm}
         \begin{tabularx}{
             \textwidth-0.4 cm-0.13cm
@@ -2127,7 +2011,27 @@
                 \item Did that.
             \end{highlights}
             &
-            Istanbul, Turkey
+            
+
+            Sept. 2021
+        \end{tabularx}
+
+        \vspace{0.2 cm}
+        \begin{tabularx}{
+            \textwidth-0.4 cm-0.13cm
+        }{
+            L{0.85cm}
+            K{0.2 cm}
+            R{4.1 cm}
+        }
+            \textbf{BS}
+            &
+            \textbf{Boğaziçi University}, Mechanical Engineering
+
+            \vspace{0.10 cm}
+
+            &
+            
 
             Sept. 2021
         \end{tabularx}
@@ -2153,6 +2057,78 @@
             &
             
 
+            Sept. 2015 to present
+        \end{tabularx}
+
+        \vspace{0.2 cm}
+        \begin{tabularx}{
+            \textwidth-0.4 cm-0.13cm
+        }{
+            L{0.85cm}
+            K{0.2 cm}
+            R{4.1 cm}
+        }
+            \textbf{BS}
+            &
+            \textbf{Boğaziçi University}, Mechanical Engineering
+
+            \vspace{0.10 cm}
+
+            \begin{highlights}
+                \item Did this.
+                \item Did that.
+            \end{highlights}
+            &
+            
+
+            Sept. 2021
+        \end{tabularx}
+
+        \vspace{0.2 cm}
+        \begin{tabularx}{
+            \textwidth-0.4 cm-0.13cm
+        }{
+            L{0.85cm}
+            K{0.2 cm}
+            R{4.1 cm}
+        }
+            \textbf{BS}
+            &
+            \textbf{Boğaziçi University}, Mechanical Engineering
+
+            \vspace{0.10 cm}
+
+            \begin{highlights}
+                \item Did this.
+                \item Did that.
+            \end{highlights}
+            &
+            
+
+            Sept. 2021
+        \end{tabularx}
+
+        \vspace{0.2 cm}
+        \begin{tabularx}{
+            \textwidth-0.4 cm-0.13cm
+        }{
+            L{0.85cm}
+            K{0.2 cm}
+            R{4.1 cm}
+        }
+            \textbf{}
+            &
+            \textbf{Boğaziçi University}, Mechanical Engineering
+
+            \vspace{0.10 cm}
+
+            \begin{highlights}
+                \item Did this.
+                \item Did that.
+            \end{highlights}
+            &
+            Istanbul, Turkey
+
             Sept. 2021
         \end{tabularx}
 
@@ -2248,6 +2224,30 @@
             Sept. 2021
         \end{tabularx}
 
+        \vspace{0.2 cm}
+        \begin{tabularx}{
+            \textwidth-0.4 cm-0.13cm
+        }{
+            L{0.85cm}
+            K{0.2 cm}
+            R{4.1 cm}
+        }
+            \textbf{BS}
+            &
+            \textbf{Boğaziçi University}, Mechanical Engineering
+
+            \vspace{0.10 cm}
+
+            \begin{highlights}
+                \item Did this.
+                \item Did that.
+            \end{highlights}
+            &
+            
+
+            Sept. 2021
+        \end{tabularx}
+
         \vspace{0.2 cm}
         \begin{tabularx}{
             \textwidth-0.4 cm-0.13cm
@@ -2288,6 +2288,24 @@
         \end{tabularx}
 
 
+        \vspace{0.2 cm}
+        \begin{tabularx}{
+            \textwidth-0.4 cm-0.13cm
+        }{
+            K{0.2 cm}
+            R{4.1 cm}
+        }
+            \textbf{My Project}
+
+            \vspace{0.10 cm}
+
+            &
+            Istanbul, Turkey
+
+            
+        \end{tabularx}
+
+
         \vspace{0.2 cm}
         \begin{tabularx}{
             \textwidth-0.4 cm-0.13cm
@@ -2373,6 +2391,64 @@
             &
             Istanbul, Turkey
 
+            Sept. 2015 to present
+        \end{tabularx}
+
+
+        \vspace{0.2 cm}
+        \begin{tabularx}{
+            \textwidth-0.4 cm-0.13cm
+        }{
+            K{0.2 cm}
+            R{4.1 cm}
+        }
+            \textbf{My Project}
+
+            \vspace{0.10 cm}
+
+            &
+            Istanbul, Turkey
+
+            Jan. 2024
+        \end{tabularx}
+
+
+        \vspace{0.2 cm}
+        \begin{tabularx}{
+            \textwidth-0.4 cm-0.13cm
+        }{
+            K{0.2 cm}
+            R{4.1 cm}
+        }
+            \textbf{My Project}
+
+            \vspace{0.10 cm}
+
+            &
+            Istanbul, Turkey
+
+            Sept. 2021
+        \end{tabularx}
+
+
+        \vspace{0.2 cm}
+        \begin{tabularx}{
+            \textwidth-0.4 cm-0.13cm
+        }{
+            K{0.2 cm}
+            R{4.1 cm}
+        }
+            \textbf{My Project}
+
+            \vspace{0.10 cm}
+
+            \begin{highlights}
+                \item Did this.
+                \item Did that.
+            \end{highlights}
+            &
+            Istanbul, Turkey
+
             
         \end{tabularx}
 
@@ -2435,24 +2511,6 @@
         \end{tabularx}
 
 
-        \vspace{0.2 cm}
-        \begin{tabularx}{
-            \textwidth-0.4 cm-0.13cm
-        }{
-            K{0.2 cm}
-            R{4.1 cm}
-        }
-            \textbf{My Project}
-
-            \vspace{0.10 cm}
-
-            &
-            Istanbul, Turkey
-
-            Sept. 2015 to present
-        \end{tabularx}
-
-
         \vspace{0.2 cm}
         \begin{tabularx}{
             \textwidth-0.4 cm-0.13cm
@@ -2493,24 +2551,6 @@
         \end{tabularx}
 
 
-        \vspace{0.2 cm}
-        \begin{tabularx}{
-            \textwidth-0.4 cm-0.13cm
-        }{
-            K{0.2 cm}
-            R{4.1 cm}
-        }
-            \textbf{My Project}
-
-            \vspace{0.10 cm}
-
-            &
-            Istanbul, Turkey
-
-            Jan. 2024
-        \end{tabularx}
-
-
         \vspace{0.2 cm}
         \begin{tabularx}{
             \textwidth-0.4 cm-0.13cm
@@ -2533,86 +2573,6 @@
         \end{tabularx}
 
 
-        \vspace{0.2 cm}
-        \begin{tabularx}{
-            \textwidth-0.4 cm-0.13cm
-        }{
-            K{0.2 cm}
-            R{4.1 cm}
-        }
-            \textbf{My Project}
-
-            \vspace{0.10 cm}
-
-            &
-            Istanbul, Turkey
-
-            Sept. 2021
-        \end{tabularx}
-
-
-        \vspace{0.2 cm}
-        \begin{tabularx}{
-            \textwidth-0.4 cm-0.13cm
-        }{
-            K{0.2 cm}
-            R{4.1 cm}
-        }
-            \textbf{My Project}
-
-            \vspace{0.10 cm}
-
-            \begin{highlights}
-                \item Did this.
-                \item Did that.
-            \end{highlights}
-            &
-            Istanbul, Turkey
-
-            
-        \end{tabularx}
-
-
-        \vspace{0.2 cm}
-        \begin{tabularx}{
-            \textwidth-0.4 cm-0.13cm
-        }{
-            K{0.2 cm}
-            R{4.1 cm}
-        }
-            \textbf{My Project}
-
-            \vspace{0.10 cm}
-
-            &
-            
-
-            Sept. 2021
-        \end{tabularx}
-
-
-        \vspace{0.2 cm}
-        \begin{tabularx}{
-            \textwidth-0.4 cm-0.13cm
-        }{
-            K{0.2 cm}
-            R{4.1 cm}
-        }
-            \textbf{My Project}
-
-            \vspace{0.10 cm}
-
-            \begin{highlights}
-                \item Did this.
-                \item Did that.
-            \end{highlights}
-            &
-            
-
-            Sept. 2015 to present
-        \end{tabularx}
-
-
         \vspace{0.2 cm}
         \begin{tabularx}{
             \textwidth-0.4 cm-0.13cm
@@ -2631,28 +2591,6 @@
         \end{tabularx}
 
 
-        \vspace{0.2 cm}
-        \begin{tabularx}{
-            \textwidth-0.4 cm-0.13cm
-        }{
-            K{0.2 cm}
-            R{4.1 cm}
-        }
-            \textbf{My Project}
-
-            \vspace{0.10 cm}
-
-            \begin{highlights}
-                \item Did this.
-                \item Did that.
-            \end{highlights}
-            &
-            
-
-            Sept. 2021
-        \end{tabularx}
-
-
         \vspace{0.2 cm}
         \begin{tabularx}{
             \textwidth-0.4 cm-0.13cm
@@ -2693,28 +2631,6 @@
         \end{tabularx}
 
 
-        \vspace{0.2 cm}
-        \begin{tabularx}{
-            \textwidth-0.4 cm-0.13cm
-        }{
-            K{0.2 cm}
-            R{4.1 cm}
-        }
-            \textbf{My Project}
-
-            \vspace{0.10 cm}
-
-            \begin{highlights}
-                \item Did this.
-                \item Did that.
-            \end{highlights}
-            &
-            
-
-            Sept. 2021
-        \end{tabularx}
-
-
         \vspace{0.2 cm}
         \begin{tabularx}{
             \textwidth-0.4 cm-0.13cm
@@ -2777,6 +2693,68 @@
         \end{tabularx}
 
 
+        \vspace{0.2 cm}
+        \begin{tabularx}{
+            \textwidth-0.4 cm-0.13cm
+        }{
+            K{0.2 cm}
+            R{4.1 cm}
+        }
+            \textbf{My Project}
+
+            \vspace{0.10 cm}
+
+            &
+            
+
+            Sept. 2021
+        \end{tabularx}
+
+
+        \vspace{0.2 cm}
+        \begin{tabularx}{
+            \textwidth-0.4 cm-0.13cm
+        }{
+            K{0.2 cm}
+            R{4.1 cm}
+        }
+            \textbf{My Project}
+
+            \vspace{0.10 cm}
+
+            \begin{highlights}
+                \item Did this.
+                \item Did that.
+            \end{highlights}
+            &
+            
+
+            Sept. 2015 to present
+        \end{tabularx}
+
+
+        \vspace{0.2 cm}
+        \begin{tabularx}{
+            \textwidth-0.4 cm-0.13cm
+        }{
+            K{0.2 cm}
+            R{4.1 cm}
+        }
+            \textbf{My Project}
+
+            \vspace{0.10 cm}
+
+            \begin{highlights}
+                \item Did this.
+                \item Did that.
+            \end{highlights}
+            &
+            
+
+            Sept. 2021
+        \end{tabularx}
+
+
         \vspace{0.2 cm}
         \begin{tabularx}{
             \textwidth-0.4 cm-0.13cm
@@ -2883,6 +2861,28 @@
         \end{tabularx}
 
 
+        \vspace{0.2 cm}
+        \begin{tabularx}{
+            \textwidth-0.4 cm-0.13cm
+        }{
+            K{0.2 cm}
+            R{4.1 cm}
+        }
+            \textbf{My Project}
+
+            \vspace{0.10 cm}
+
+            \begin{highlights}
+                \item Did this.
+                \item Did that.
+            \end{highlights}
+            &
+            
+
+            Sept. 2021
+        \end{tabularx}
+
+
         \vspace{0.2 cm}
         \begin{tabularx}{
             \textwidth-0.4 cm-0.13cm
diff --git a/tests/testdata/test_generate_latex_file_and_copy_theme_files/moderncv_filled/John_Doe_CV.tex b/tests/testdata/test_generate_latex_file_and_copy_theme_files/moderncv_filled/John_Doe_CV.tex
index 237d4122..ebaff72f 100644
--- a/tests/testdata/test_generate_latex_file_and_copy_theme_files/moderncv_filled/John_Doe_CV.tex
+++ b/tests/testdata/test_generate_latex_file_and_copy_theme_files/moderncv_filled/John_Doe_CV.tex
@@ -118,6 +118,9 @@
         \cventry{}{Software Engineer}{Some Company}{}{}{}
 
 
+        \cventry{}{Software Engineer}{Some Company}{Istanbul, Turkey}{}{}
+
+
         \cventry{Sept. 2015 to present}{Software Engineer}{Some Company}{}{}{}
 
 
@@ -132,7 +135,18 @@
         \cvlistitem{Did that.}
 
 
+        \cventry{Sept. 2015 to present}{Software Engineer}{Some Company}{Istanbul, Turkey}{}{}
+
+
+        \cventry{Jan. 2024}{Software Engineer}{Some Company}{Istanbul, Turkey}{}{}
+
+
+        \cventry{Sept. 2021}{Software Engineer}{Some Company}{Istanbul, Turkey}{}{}
+
+
         \cventry{}{Software Engineer}{Some Company}{Istanbul, Turkey}{}{}
+        \cvlistitem{Did this.}
+        \cvlistitem{Did that.}
 
 
         \cventry{Sept. 2015 to present}{Software Engineer}{Some Company}{}{}{}
@@ -146,9 +160,6 @@
         \cvlistitem{Did that.}
 
 
-        \cventry{Sept. 2015 to present}{Software Engineer}{Some Company}{Istanbul, Turkey}{}{}
-
-
         \cventry{Sept. 2021}{Software Engineer}{Some Company}{}{}{}
 
 
@@ -157,18 +168,31 @@
         \cvlistitem{Did that.}
 
 
-        \cventry{Jan. 2024}{Software Engineer}{Some Company}{Istanbul, Turkey}{}{}
-
-
         \cventry{Sept. 2021}{Software Engineer}{Some Company}{}{}{}
         \cvlistitem{Did this.}
         \cvlistitem{Did that.}
 
 
+        \cventry{Sept. 2015 to present}{Software Engineer}{Some Company}{Istanbul, Turkey}{}{}
+
+
+        \cventry{Sept. 2021}{Software Engineer}{Some Company}{Istanbul, Turkey}{}{}
+
+
+        \cventry{Sept. 2015 to present}{Software Engineer}{Some Company}{Istanbul, Turkey}{}{}
+        \cvlistitem{Did this.}
+        \cvlistitem{Did that.}
+
+
         \cventry{Sept. 2021}{Software Engineer}{Some Company}{Istanbul, Turkey}{}{}
 
 
-        \cventry{}{Software Engineer}{Some Company}{Istanbul, Turkey}{}{}
+        \cventry{Jan. 2024}{Software Engineer}{Some Company}{Istanbul, Turkey}{}{}
+        \cvlistitem{Did this.}
+        \cvlistitem{Did that.}
+
+
+        \cventry{Sept. 2021}{Software Engineer}{Some Company}{Istanbul, Turkey}{}{}
         \cvlistitem{Did this.}
         \cvlistitem{Did that.}
 
@@ -181,40 +205,11 @@
         \cvlistitem{Did that.}
 
 
-        \cventry{Sept. 2015 to present}{Software Engineer}{Some Company}{Istanbul, Turkey}{}{}
-
-
         \cventry{Sept. 2021}{Software Engineer}{Some Company}{}{}{}
         \cvlistitem{Did this.}
         \cvlistitem{Did that.}
 
 
-        \cventry{Sept. 2021}{Software Engineer}{Some Company}{Istanbul, Turkey}{}{}
-
-
-        \cventry{Sept. 2015 to present}{Software Engineer}{Some Company}{Istanbul, Turkey}{}{}
-        \cvlistitem{Did this.}
-        \cvlistitem{Did that.}
-
-
-        \cventry{Sept. 2021}{Software Engineer}{Some Company}{}{}{}
-        \cvlistitem{Did this.}
-        \cvlistitem{Did that.}
-
-
-        \cventry{Sept. 2021}{Software Engineer}{Some Company}{Istanbul, Turkey}{}{}
-
-
-        \cventry{Jan. 2024}{Software Engineer}{Some Company}{Istanbul, Turkey}{}{}
-        \cvlistitem{Did this.}
-        \cvlistitem{Did that.}
-
-
-        \cventry{Sept. 2021}{Software Engineer}{Some Company}{Istanbul, Turkey}{}{}
-        \cvlistitem{Did this.}
-        \cvlistitem{Did that.}
-
-
         \cventry{Sept. 2021}{Software Engineer}{Some Company}{}{}{}
         \cvlistitem{Did this.}
         \cvlistitem{Did that.}
@@ -238,6 +233,11 @@
         \cvlistitem{Did that.}
 
 
+        \cventry{Sept. 2021}{Software Engineer}{Some Company}{}{}{}
+        \cvlistitem{Did this.}
+        \cvlistitem{Did that.}
+
+
         \cventry{Sept. 2021}{Software Engineer}{Some Company}{Istanbul, Turkey}{}{}
         \cvlistitem{Did this.}
         \cvlistitem{Did that.}
@@ -250,6 +250,9 @@
         \cventry{}{Mechanical Engineering}{Boğaziçi University}{}{}{}
 
 
+        \cventry{}{Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
+
+
         \cventry{Sept. 2015 to present}{Mechanical Engineering}{Boğaziçi University}{}{}{}
 
 
@@ -264,12 +267,26 @@
         \cvlistitem{Did that.}
 
 
-        \cventry{}{Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
-
-
         \cventry{}{BS, Mechanical Engineering}{Boğaziçi University}{}{}{}
 
 
+        \cventry{Sept. 2015 to present}{Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
+
+
+        \cventry{Jan. 2024}{Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
+
+
+        \cventry{Sept. 2021}{Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
+
+
+        \cventry{}{Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
+        \cvlistitem{Did this.}
+        \cvlistitem{Did that.}
+
+
+        \cventry{}{BS, Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
+
+
         \cventry{Sept. 2015 to present}{Mechanical Engineering}{Boğaziçi University}{}{}{}
 
 
@@ -281,9 +298,6 @@
         \cvlistitem{Did that.}
 
 
-        \cventry{Sept. 2015 to present}{Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
-
-
         \cventry{Sept. 2015 to present}{BS, Mechanical Engineering}{Boğaziçi University}{}{}{}
 
 
@@ -295,9 +309,6 @@
         \cvlistitem{Did that.}
 
 
-        \cventry{Jan. 2024}{Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
-
-
         \cventry{Jan. 2024}{BS, Mechanical Engineering}{Boğaziçi University}{}{}{}
 
 
@@ -306,23 +317,50 @@
         \cvlistitem{Did that.}
 
 
-        \cventry{Sept. 2021}{Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
-
-
         \cventry{Sept. 2021}{BS, Mechanical Engineering}{Boğaziçi University}{}{}{}
 
 
-        \cventry{}{Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
-        \cvlistitem{Did this.}
-        \cvlistitem{Did that.}
-
-
         \cventry{}{BS, Mechanical Engineering}{Boğaziçi University}{}{}{}
         \cvlistitem{Did this.}
         \cvlistitem{Did that.}
 
 
+        \cventry{Sept. 2015 to present}{Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
+
+
+        \cventry{Sept. 2021}{Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
+
+
+        \cventry{Sept. 2015 to present}{Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
+        \cvlistitem{Did this.}
+        \cvlistitem{Did that.}
+
+
+        \cventry{Sept. 2015 to present}{BS, Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
+
+
+        \cventry{Sept. 2021}{Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
+
+
+        \cventry{Jan. 2024}{Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
+        \cvlistitem{Did this.}
+        \cvlistitem{Did that.}
+
+
+        \cventry{Jan. 2024}{BS, Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
+
+
+        \cventry{Sept. 2021}{Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
+        \cvlistitem{Did this.}
+        \cvlistitem{Did that.}
+
+
+        \cventry{Sept. 2021}{BS, Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
+
+
         \cventry{}{BS, Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
+        \cvlistitem{Did this.}
+        \cvlistitem{Did that.}
 
 
         \cventry{Sept. 2021}{Mechanical Engineering}{Boğaziçi University}{}{}{}
@@ -333,9 +371,6 @@
         \cvlistitem{Did that.}
 
 
-        \cventry{Sept. 2015 to present}{Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
-
-
         \cventry{Sept. 2015 to present}{BS, Mechanical Engineering}{Boğaziçi University}{}{}{}
 
 
@@ -344,47 +379,41 @@
         \cvlistitem{Did that.}
 
 
-        \cventry{Sept. 2021}{Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
-
-
         \cventry{Sept. 2021}{BS, Mechanical Engineering}{Boğaziçi University}{}{}{}
 
 
-        \cventry{Sept. 2015 to present}{Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
-        \cvlistitem{Did this.}
-        \cvlistitem{Did that.}
-
-
         \cventry{Sept. 2015 to present}{BS, Mechanical Engineering}{Boğaziçi University}{}{}{}
         \cvlistitem{Did this.}
         \cvlistitem{Did that.}
 
 
-        \cventry{Sept. 2015 to present}{BS, Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
-
-
         \cventry{Sept. 2021}{Mechanical Engineering}{Boğaziçi University}{}{}{}
         \cvlistitem{Did this.}
         \cvlistitem{Did that.}
 
 
-        \cventry{Sept. 2021}{Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
-
-
         \cventry{Sept. 2021}{BS, Mechanical Engineering}{Boğaziçi University}{}{}{}
 
 
-        \cventry{Jan. 2024}{Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
-        \cvlistitem{Did this.}
-        \cvlistitem{Did that.}
-
-
         \cventry{Jan. 2024}{BS, Mechanical Engineering}{Boğaziçi University}{}{}{}
         \cvlistitem{Did this.}
         \cvlistitem{Did that.}
 
 
-        \cventry{Jan. 2024}{BS, Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
+        \cventry{Sept. 2021}{BS, Mechanical Engineering}{Boğaziçi University}{}{}{}
+        \cvlistitem{Did this.}
+        \cvlistitem{Did that.}
+
+
+        \cventry{Sept. 2021}{Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
+
+
+        \cventry{Sept. 2015 to present}{Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
+        \cvlistitem{Did this.}
+        \cvlistitem{Did that.}
+
+
+        \cventry{Sept. 2015 to present}{BS, Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
 
 
         \cventry{Sept. 2021}{Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
@@ -392,7 +421,15 @@
         \cvlistitem{Did that.}
 
 
-        \cventry{Sept. 2021}{BS, Mechanical Engineering}{Boğaziçi University}{}{}{}
+        \cventry{Sept. 2021}{BS, Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
+
+
+        \cventry{Sept. 2015 to present}{BS, Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
+        \cvlistitem{Did this.}
+        \cvlistitem{Did that.}
+
+
+        \cventry{Sept. 2021}{Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
         \cvlistitem{Did this.}
         \cvlistitem{Did that.}
 
@@ -400,7 +437,12 @@
         \cventry{Sept. 2021}{BS, Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
 
 
-        \cventry{}{BS, Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
+        \cventry{Jan. 2024}{BS, Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
+        \cvlistitem{Did this.}
+        \cvlistitem{Did that.}
+
+
+        \cventry{Sept. 2021}{BS, Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
         \cvlistitem{Did this.}
         \cvlistitem{Did that.}
 
@@ -410,26 +452,15 @@
         \cvlistitem{Did that.}
 
 
-        \cventry{Sept. 2021}{Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
-
-
         \cventry{Sept. 2021}{BS, Mechanical Engineering}{Boğaziçi University}{}{}{}
 
 
-        \cventry{Sept. 2015 to present}{Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
-        \cvlistitem{Did this.}
-        \cvlistitem{Did that.}
-
-
         \cventry{Sept. 2015 to present}{BS, Mechanical Engineering}{Boğaziçi University}{}{}{}
         \cvlistitem{Did this.}
         \cvlistitem{Did that.}
 
 
-        \cventry{Sept. 2015 to present}{BS, Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
-
-
-        \cventry{Sept. 2021}{Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
+        \cventry{Sept. 2021}{BS, Mechanical Engineering}{Boğaziçi University}{}{}{}
         \cvlistitem{Did this.}
         \cvlistitem{Did that.}
 
@@ -439,47 +470,11 @@
         \cvlistitem{Did that.}
 
 
-        \cventry{Sept. 2021}{BS, Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
-
-
-        \cventry{Sept. 2015 to present}{BS, Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
-        \cvlistitem{Did this.}
-        \cvlistitem{Did that.}
-
-
         \cventry{Sept. 2021}{Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
         \cvlistitem{Did this.}
         \cvlistitem{Did that.}
 
 
-        \cventry{Sept. 2021}{BS, Mechanical Engineering}{Boğaziçi University}{}{}{}
-        \cvlistitem{Did this.}
-        \cvlistitem{Did that.}
-
-
-        \cventry{Sept. 2021}{BS, Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
-
-
-        \cventry{Jan. 2024}{BS, Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
-        \cvlistitem{Did this.}
-        \cvlistitem{Did that.}
-
-
-        \cventry{Sept. 2021}{BS, Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
-        \cvlistitem{Did this.}
-        \cvlistitem{Did that.}
-
-
-        \cventry{Sept. 2021}{Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
-        \cvlistitem{Did this.}
-        \cvlistitem{Did that.}
-
-
-        \cventry{Sept. 2021}{BS, Mechanical Engineering}{Boğaziçi University}{}{}{}
-        \cvlistitem{Did this.}
-        \cvlistitem{Did that.}
-
-
         \cventry{Sept. 2021}{BS, Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
 
 
@@ -498,6 +493,11 @@
         \cvlistitem{Did that.}
 
 
+        \cventry{Sept. 2021}{BS, Mechanical Engineering}{Boğaziçi University}{}{}{}
+        \cvlistitem{Did this.}
+        \cvlistitem{Did that.}
+
+
         \cventry{Sept. 2021}{BS, Mechanical Engineering}{Boğaziçi University}{Istanbul, Turkey}{}{}
         \cvlistitem{Did this.}
         \cvlistitem{Did that.}
@@ -510,6 +510,9 @@
         \cventry{}{My Project}{}{}{}{}
 
 
+        \cventry{}{My Project}{}{Istanbul, Turkey}{}{}
+
+
         \cventry{Sept. 2015 to present}{My Project}{}{}{}{}
 
 
@@ -524,7 +527,18 @@
         \cvlistitem{Did that.}
 
 
+        \cventry{Sept. 2015 to present}{My Project}{}{Istanbul, Turkey}{}{}
+
+
+        \cventry{Jan. 2024}{My Project}{}{Istanbul, Turkey}{}{}
+
+
+        \cventry{Sept. 2021}{My Project}{}{Istanbul, Turkey}{}{}
+
+
         \cventry{}{My Project}{}{Istanbul, Turkey}{}{}
+        \cvlistitem{Did this.}
+        \cvlistitem{Did that.}
 
 
         \cventry{Sept. 2015 to present}{My Project}{}{}{}{}
@@ -538,9 +552,6 @@
         \cvlistitem{Did that.}
 
 
-        \cventry{Sept. 2015 to present}{My Project}{}{Istanbul, Turkey}{}{}
-
-
         \cventry{Sept. 2021}{My Project}{}{}{}{}
 
 
@@ -549,18 +560,31 @@
         \cvlistitem{Did that.}
 
 
-        \cventry{Jan. 2024}{My Project}{}{Istanbul, Turkey}{}{}
-
-
         \cventry{Sept. 2021}{My Project}{}{}{}{}
         \cvlistitem{Did this.}
         \cvlistitem{Did that.}
 
 
+        \cventry{Sept. 2015 to present}{My Project}{}{Istanbul, Turkey}{}{}
+
+
+        \cventry{Sept. 2021}{My Project}{}{Istanbul, Turkey}{}{}
+
+
+        \cventry{Sept. 2015 to present}{My Project}{}{Istanbul, Turkey}{}{}
+        \cvlistitem{Did this.}
+        \cvlistitem{Did that.}
+
+
         \cventry{Sept. 2021}{My Project}{}{Istanbul, Turkey}{}{}
 
 
-        \cventry{}{My Project}{}{Istanbul, Turkey}{}{}
+        \cventry{Jan. 2024}{My Project}{}{Istanbul, Turkey}{}{}
+        \cvlistitem{Did this.}
+        \cvlistitem{Did that.}
+
+
+        \cventry{Sept. 2021}{My Project}{}{Istanbul, Turkey}{}{}
         \cvlistitem{Did this.}
         \cvlistitem{Did that.}
 
@@ -573,40 +597,11 @@
         \cvlistitem{Did that.}
 
 
-        \cventry{Sept. 2015 to present}{My Project}{}{Istanbul, Turkey}{}{}
-
-
         \cventry{Sept. 2021}{My Project}{}{}{}{}
         \cvlistitem{Did this.}
         \cvlistitem{Did that.}
 
 
-        \cventry{Sept. 2021}{My Project}{}{Istanbul, Turkey}{}{}
-
-
-        \cventry{Sept. 2015 to present}{My Project}{}{Istanbul, Turkey}{}{}
-        \cvlistitem{Did this.}
-        \cvlistitem{Did that.}
-
-
-        \cventry{Sept. 2021}{My Project}{}{}{}{}
-        \cvlistitem{Did this.}
-        \cvlistitem{Did that.}
-
-
-        \cventry{Sept. 2021}{My Project}{}{Istanbul, Turkey}{}{}
-
-
-        \cventry{Jan. 2024}{My Project}{}{Istanbul, Turkey}{}{}
-        \cvlistitem{Did this.}
-        \cvlistitem{Did that.}
-
-
-        \cventry{Sept. 2021}{My Project}{}{Istanbul, Turkey}{}{}
-        \cvlistitem{Did this.}
-        \cvlistitem{Did that.}
-
-
         \cventry{Sept. 2021}{My Project}{}{}{}{}
         \cvlistitem{Did this.}
         \cvlistitem{Did that.}
@@ -630,6 +625,11 @@
         \cvlistitem{Did that.}
 
 
+        \cventry{Sept. 2021}{My Project}{}{}{}{}
+        \cvlistitem{Did this.}
+        \cvlistitem{Did that.}
+
+
         \cventry{Sept. 2021}{My Project}{}{Istanbul, Turkey}{}{}
         \cvlistitem{Did this.}
         \cvlistitem{Did that.}
diff --git a/tests/testdata/test_generate_latex_file_and_copy_theme_files/sb2nov_filled/John_Doe_CV.tex b/tests/testdata/test_generate_latex_file_and_copy_theme_files/sb2nov_filled/John_Doe_CV.tex
index 0bf7cd98..d4b9d419 100644
--- a/tests/testdata/test_generate_latex_file_and_copy_theme_files/sb2nov_filled/John_Doe_CV.tex
+++ b/tests/testdata/test_generate_latex_file_and_copy_theme_files/sb2nov_filled/John_Doe_CV.tex
@@ -230,6 +230,11 @@
             {Software Engineer}{}
 
 
+        \resumeSubheading
+            {Some Company}{Istanbul, Turkey}
+            {Software Engineer}{}
+
+
         \resumeSubheading
             {Some Company}{}
             {Software Engineer}{Sept. 2015 to present}
@@ -256,61 +261,14 @@
 
         \resumeSubheading
             {Some Company}{Istanbul, Turkey}
-            {Software Engineer}{}
-
-
-        \resumeSubheading
-            {Some Company}{}
             {Software Engineer}{Sept. 2015 to present}
 
 
-        \resumeSubheading
-            {Some Company}{}
-            {Software Engineer}{Sept. 2021}
-
-
-        \resumeSubheading
-            {Some Company}{}
-            {Software Engineer}{Sept. 2015 to present}
-            \resumeItemListStart
-                \resumeItem{}{Did this.}
-                \resumeItem{}{Did that.}
-            \resumeItemListEnd
-
-
-        \resumeSubheading
-            {Some Company}{Istanbul, Turkey}
-            {Software Engineer}{Sept. 2015 to present}
-
-
-        \resumeSubheading
-            {Some Company}{}
-            {Software Engineer}{Sept. 2021}
-
-
-        \resumeSubheading
-            {Some Company}{}
-            {Software Engineer}{Jan. 2024}
-            \resumeItemListStart
-                \resumeItem{}{Did this.}
-                \resumeItem{}{Did that.}
-            \resumeItemListEnd
-
-
         \resumeSubheading
             {Some Company}{Istanbul, Turkey}
             {Software Engineer}{Jan. 2024}
 
 
-        \resumeSubheading
-            {Some Company}{}
-            {Software Engineer}{Sept. 2021}
-            \resumeItemListStart
-                \resumeItem{}{Did this.}
-                \resumeItem{}{Did that.}
-            \resumeItemListEnd
-
-
         \resumeSubheading
             {Some Company}{Istanbul, Turkey}
             {Software Engineer}{Sept. 2021}
@@ -325,6 +283,11 @@
             \resumeItemListEnd
 
 
+        \resumeSubheading
+            {Some Company}{}
+            {Software Engineer}{Sept. 2015 to present}
+
+
         \resumeSubheading
             {Some Company}{}
             {Software Engineer}{Sept. 2021}
@@ -340,8 +303,17 @@
 
 
         \resumeSubheading
-            {Some Company}{Istanbul, Turkey}
-            {Software Engineer}{Sept. 2015 to present}
+            {Some Company}{}
+            {Software Engineer}{Sept. 2021}
+
+
+        \resumeSubheading
+            {Some Company}{}
+            {Software Engineer}{Jan. 2024}
+            \resumeItemListStart
+                \resumeItem{}{Did this.}
+                \resumeItem{}{Did that.}
+            \resumeItemListEnd
 
 
         \resumeSubheading
@@ -353,6 +325,11 @@
             \resumeItemListEnd
 
 
+        \resumeSubheading
+            {Some Company}{Istanbul, Turkey}
+            {Software Engineer}{Sept. 2015 to present}
+
+
         \resumeSubheading
             {Some Company}{Istanbul, Turkey}
             {Software Engineer}{Sept. 2021}
@@ -367,15 +344,6 @@
             \resumeItemListEnd
 
 
-        \resumeSubheading
-            {Some Company}{}
-            {Software Engineer}{Sept. 2021}
-            \resumeItemListStart
-                \resumeItem{}{Did this.}
-                \resumeItem{}{Did that.}
-            \resumeItemListEnd
-
-
         \resumeSubheading
             {Some Company}{Istanbul, Turkey}
             {Software Engineer}{Sept. 2021}
@@ -399,6 +367,29 @@
             \resumeItemListEnd
 
 
+        \resumeSubheading
+            {Some Company}{}
+            {Software Engineer}{Sept. 2021}
+
+
+        \resumeSubheading
+            {Some Company}{}
+            {Software Engineer}{Sept. 2015 to present}
+            \resumeItemListStart
+                \resumeItem{}{Did this.}
+                \resumeItem{}{Did that.}
+            \resumeItemListEnd
+
+
+        \resumeSubheading
+            {Some Company}{}
+            {Software Engineer}{Sept. 2021}
+            \resumeItemListStart
+                \resumeItem{}{Did this.}
+                \resumeItem{}{Did that.}
+            \resumeItemListEnd
+
+
         \resumeSubheading
             {Some Company}{}
             {Software Engineer}{Sept. 2021}
@@ -440,6 +431,15 @@
             \resumeItemListEnd
 
 
+        \resumeSubheading
+            {Some Company}{}
+            {Software Engineer}{Sept. 2021}
+            \resumeItemListStart
+                \resumeItem{}{Did this.}
+                \resumeItem{}{Did that.}
+            \resumeItemListEnd
+
+
         \resumeSubheading
             {Some Company}{Istanbul, Turkey}
             {Software Engineer}{Sept. 2021}
@@ -459,6 +459,11 @@
             {Mechanical Engineering}{}
 
 
+        \resumeSubheading
+            {Boğaziçi University}{Istanbul, Turkey}
+            {Mechanical Engineering}{}
+
+
         \resumeSubheading
             {Boğaziçi University}{}
             {Mechanical Engineering}{Sept. 2015 to present}
@@ -483,88 +488,26 @@
             \resumeItemListEnd
 
 
-        \resumeSubheading
-            {Boğaziçi University}{Istanbul, Turkey}
-            {Mechanical Engineering}{}
-
-
         \resumeSubheading
             {Boğaziçi University}{}
             {BS in Mechanical Engineering}{}
 
 
-        \resumeSubheading
-            {Boğaziçi University}{}
-            {Mechanical Engineering}{Sept. 2015 to present}
-
-
-        \resumeSubheading
-            {Boğaziçi University}{}
-            {Mechanical Engineering}{Sept. 2021}
-
-
-        \resumeSubheading
-            {Boğaziçi University}{}
-            {Mechanical Engineering}{Sept. 2015 to present}
-            \resumeItemListStart
-                \resumeItem{}{Did this.}
-                \resumeItem{}{Did that.}
-            \resumeItemListEnd
-
-
         \resumeSubheading
             {Boğaziçi University}{Istanbul, Turkey}
             {Mechanical Engineering}{Sept. 2015 to present}
 
 
-        \resumeSubheading
-            {Boğaziçi University}{}
-            {BS in Mechanical Engineering}{Sept. 2015 to present}
-
-
-        \resumeSubheading
-            {Boğaziçi University}{}
-            {Mechanical Engineering}{Sept. 2021}
-
-
-        \resumeSubheading
-            {Boğaziçi University}{}
-            {Mechanical Engineering}{Jan. 2024}
-            \resumeItemListStart
-                \resumeItem{}{Did this.}
-                \resumeItem{}{Did that.}
-            \resumeItemListEnd
-
-
         \resumeSubheading
             {Boğaziçi University}{Istanbul, Turkey}
             {Mechanical Engineering}{Jan. 2024}
 
 
-        \resumeSubheading
-            {Boğaziçi University}{}
-            {BS in Mechanical Engineering}{Jan. 2024}
-
-
-        \resumeSubheading
-            {Boğaziçi University}{}
-            {Mechanical Engineering}{Sept. 2021}
-            \resumeItemListStart
-                \resumeItem{}{Did this.}
-                \resumeItem{}{Did that.}
-            \resumeItemListEnd
-
-
         \resumeSubheading
             {Boğaziçi University}{Istanbul, Turkey}
             {Mechanical Engineering}{Sept. 2021}
 
 
-        \resumeSubheading
-            {Boğaziçi University}{}
-            {BS in Mechanical Engineering}{Sept. 2021}
-
-
         \resumeSubheading
             {Boğaziçi University}{Istanbul, Turkey}
             {Mechanical Engineering}{}
@@ -574,6 +517,68 @@
             \resumeItemListEnd
 
 
+        \resumeSubheading
+            {Boğaziçi University}{Istanbul, Turkey}
+            {BS in Mechanical Engineering}{}
+
+
+        \resumeSubheading
+            {Boğaziçi University}{}
+            {Mechanical Engineering}{Sept. 2015 to present}
+
+
+        \resumeSubheading
+            {Boğaziçi University}{}
+            {Mechanical Engineering}{Sept. 2021}
+
+
+        \resumeSubheading
+            {Boğaziçi University}{}
+            {Mechanical Engineering}{Sept. 2015 to present}
+            \resumeItemListStart
+                \resumeItem{}{Did this.}
+                \resumeItem{}{Did that.}
+            \resumeItemListEnd
+
+
+        \resumeSubheading
+            {Boğaziçi University}{}
+            {BS in Mechanical Engineering}{Sept. 2015 to present}
+
+
+        \resumeSubheading
+            {Boğaziçi University}{}
+            {Mechanical Engineering}{Sept. 2021}
+
+
+        \resumeSubheading
+            {Boğaziçi University}{}
+            {Mechanical Engineering}{Jan. 2024}
+            \resumeItemListStart
+                \resumeItem{}{Did this.}
+                \resumeItem{}{Did that.}
+            \resumeItemListEnd
+
+
+        \resumeSubheading
+            {Boğaziçi University}{}
+            {BS in Mechanical Engineering}{Jan. 2024}
+
+
+        \resumeSubheading
+            {Boğaziçi University}{}
+            {Mechanical Engineering}{Sept. 2021}
+            \resumeItemListStart
+                \resumeItem{}{Did this.}
+                \resumeItem{}{Did that.}
+            \resumeItemListEnd
+
+
+        \resumeSubheading
+            {Boğaziçi University}{}
+            {BS in Mechanical Engineering}{Sept. 2021}
+
+
         \resumeSubheading
             {Boğaziçi University}{}
             {BS in Mechanical Engineering}{}
@@ -585,40 +590,7 @@
 
         \resumeSubheading
             {Boğaziçi University}{Istanbul, Turkey}
-            {BS in Mechanical Engineering}{}
-
-
-        \resumeSubheading
-            {Boğaziçi University}{}
-            {Mechanical Engineering}{Sept. 2021}
-
-
-        \resumeSubheading
-            {Boğaziçi University}{}
             {Mechanical Engineering}{Sept. 2015 to present}
-            \resumeItemListStart
-                \resumeItem{}{Did this.}
-                \resumeItem{}{Did that.}
-            \resumeItemListEnd
-
-
-        \resumeSubheading
-            {Boğaziçi University}{Istanbul, Turkey}
-            {Mechanical Engineering}{Sept. 2015 to present}
-
-
-        \resumeSubheading
-            {Boğaziçi University}{}
-            {BS in Mechanical Engineering}{Sept. 2015 to present}
-
-
-        \resumeSubheading
-            {Boğaziçi University}{}
-            {Mechanical Engineering}{Sept. 2021}
-            \resumeItemListStart
-                \resumeItem{}{Did this.}
-                \resumeItem{}{Did that.}
-            \resumeItemListEnd
 
 
         \resumeSubheading
@@ -626,11 +598,6 @@
             {Mechanical Engineering}{Sept. 2021}
 
 
-        \resumeSubheading
-            {Boğaziçi University}{}
-            {BS in Mechanical Engineering}{Sept. 2021}
-
-
         \resumeSubheading
             {Boğaziçi University}{Istanbul, Turkey}
             {Mechanical Engineering}{Sept. 2015 to present}
@@ -640,39 +607,16 @@
             \resumeItemListEnd
 
 
-        \resumeSubheading
-            {Boğaziçi University}{}
-            {BS in Mechanical Engineering}{Sept. 2015 to present}
-            \resumeItemListStart
-                \resumeItem{}{Did this.}
-                \resumeItem{}{Did that.}
-            \resumeItemListEnd
-
-
         \resumeSubheading
             {Boğaziçi University}{Istanbul, Turkey}
             {BS in Mechanical Engineering}{Sept. 2015 to present}
 
 
-        \resumeSubheading
-            {Boğaziçi University}{}
-            {Mechanical Engineering}{Sept. 2021}
-            \resumeItemListStart
-                \resumeItem{}{Did this.}
-                \resumeItem{}{Did that.}
-            \resumeItemListEnd
-
-
         \resumeSubheading
             {Boğaziçi University}{Istanbul, Turkey}
             {Mechanical Engineering}{Sept. 2021}
 
 
-        \resumeSubheading
-            {Boğaziçi University}{}
-            {BS in Mechanical Engineering}{Sept. 2021}
-
-
         \resumeSubheading
             {Boğaziçi University}{Istanbul, Turkey}
             {Mechanical Engineering}{Jan. 2024}
@@ -682,15 +626,6 @@
             \resumeItemListEnd
 
 
-        \resumeSubheading
-            {Boğaziçi University}{}
-            {BS in Mechanical Engineering}{Jan. 2024}
-            \resumeItemListStart
-                \resumeItem{}{Did this.}
-                \resumeItem{}{Did that.}
-            \resumeItemListEnd
-
-
         \resumeSubheading
             {Boğaziçi University}{Istanbul, Turkey}
             {BS in Mechanical Engineering}{Jan. 2024}
@@ -705,15 +640,6 @@
             \resumeItemListEnd
 
 
-        \resumeSubheading
-            {Boğaziçi University}{}
-            {BS in Mechanical Engineering}{Sept. 2021}
-            \resumeItemListStart
-                \resumeItem{}{Did this.}
-                \resumeItem{}{Did that.}
-            \resumeItemListEnd
-
-
         \resumeSubheading
             {Boğaziçi University}{Istanbul, Turkey}
             {BS in Mechanical Engineering}{Sept. 2021}
@@ -731,6 +657,71 @@
         \resumeSubheading
             {Boğaziçi University}{}
             {Mechanical Engineering}{Sept. 2021}
+
+
+        \resumeSubheading
+            {Boğaziçi University}{}
+            {Mechanical Engineering}{Sept. 2015 to present}
+            \resumeItemListStart
+                \resumeItem{}{Did this.}
+                \resumeItem{}{Did that.}
+            \resumeItemListEnd
+
+
+        \resumeSubheading
+            {Boğaziçi University}{}
+            {BS in Mechanical Engineering}{Sept. 2015 to present}
+
+
+        \resumeSubheading
+            {Boğaziçi University}{}
+            {Mechanical Engineering}{Sept. 2021}
+            \resumeItemListStart
+                \resumeItem{}{Did this.}
+                \resumeItem{}{Did that.}
+            \resumeItemListEnd
+
+
+        \resumeSubheading
+            {Boğaziçi University}{}
+            {BS in Mechanical Engineering}{Sept. 2021}
+
+
+        \resumeSubheading
+            {Boğaziçi University}{}
+            {BS in Mechanical Engineering}{Sept. 2015 to present}
+            \resumeItemListStart
+                \resumeItem{}{Did this.}
+                \resumeItem{}{Did that.}
+            \resumeItemListEnd
+
+
+        \resumeSubheading
+            {Boğaziçi University}{}
+            {Mechanical Engineering}{Sept. 2021}
+            \resumeItemListStart
+                \resumeItem{}{Did this.}
+                \resumeItem{}{Did that.}
+            \resumeItemListEnd
+
+
+        \resumeSubheading
+            {Boğaziçi University}{}
+            {BS in Mechanical Engineering}{Sept. 2021}
+
+
+        \resumeSubheading
+            {Boğaziçi University}{}
+            {BS in Mechanical Engineering}{Jan. 2024}
+            \resumeItemListStart
+                \resumeItem{}{Did this.}
+                \resumeItem{}{Did that.}
+            \resumeItemListEnd
+
+
+        \resumeSubheading
+            {Boğaziçi University}{}
+            {BS in Mechanical Engineering}{Sept. 2021}
             \resumeItemListStart
                 \resumeItem{}{Did this.}
                 \resumeItem{}{Did that.}
@@ -742,11 +733,6 @@
             {Mechanical Engineering}{Sept. 2021}
 
 
-        \resumeSubheading
-            {Boğaziçi University}{}
-            {BS in Mechanical Engineering}{Sept. 2021}
-
-
         \resumeSubheading
             {Boğaziçi University}{Istanbul, Turkey}
             {Mechanical Engineering}{Sept. 2015 to present}
@@ -756,15 +742,6 @@
             \resumeItemListEnd
 
 
-        \resumeSubheading
-            {Boğaziçi University}{}
-            {BS in Mechanical Engineering}{Sept. 2015 to present}
-            \resumeItemListStart
-                \resumeItem{}{Did this.}
-                \resumeItem{}{Did that.}
-            \resumeItemListEnd
-
-
         \resumeSubheading
             {Boğaziçi University}{Istanbul, Turkey}
             {BS in Mechanical Engineering}{Sept. 2015 to present}
@@ -779,15 +756,6 @@
             \resumeItemListEnd
 
 
-        \resumeSubheading
-            {Boğaziçi University}{}
-            {BS in Mechanical Engineering}{Sept. 2021}
-            \resumeItemListStart
-                \resumeItem{}{Did this.}
-                \resumeItem{}{Did that.}
-            \resumeItemListEnd
-
-
         \resumeSubheading
             {Boğaziçi University}{Istanbul, Turkey}
             {BS in Mechanical Engineering}{Sept. 2021}
@@ -811,15 +779,6 @@
             \resumeItemListEnd
 
 
-        \resumeSubheading
-            {Boğaziçi University}{}
-            {BS in Mechanical Engineering}{Sept. 2021}
-            \resumeItemListStart
-                \resumeItem{}{Did this.}
-                \resumeItem{}{Did that.}
-            \resumeItemListEnd
-
-
         \resumeSubheading
             {Boğaziçi University}{Istanbul, Turkey}
             {BS in Mechanical Engineering}{Sept. 2021}
@@ -844,7 +803,7 @@
 
 
         \resumeSubheading
-            {Boğaziçi University}{Istanbul, Turkey}
+            {Boğaziçi University}{}
             {Mechanical Engineering}{Sept. 2021}
             \resumeItemListStart
                 \resumeItem{}{Did this.}
@@ -855,6 +814,38 @@
         \resumeSubheading
             {Boğaziçi University}{}
             {BS in Mechanical Engineering}{Sept. 2021}
+
+
+        \resumeSubheading
+            {Boğaziçi University}{}
+            {BS in Mechanical Engineering}{Sept. 2015 to present}
+            \resumeItemListStart
+                \resumeItem{}{Did this.}
+                \resumeItem{}{Did that.}
+            \resumeItemListEnd
+
+
+        \resumeSubheading
+            {Boğaziçi University}{}
+            {BS in Mechanical Engineering}{Sept. 2021}
+            \resumeItemListStart
+                \resumeItem{}{Did this.}
+                \resumeItem{}{Did that.}
+            \resumeItemListEnd
+
+
+        \resumeSubheading
+            {Boğaziçi University}{}
+            {BS in Mechanical Engineering}{Sept. 2021}
+            \resumeItemListStart
+                \resumeItem{}{Did this.}
+                \resumeItem{}{Did that.}
+            \resumeItemListEnd
+
+
+        \resumeSubheading
+            {Boğaziçi University}{Istanbul, Turkey}
+            {Mechanical Engineering}{Sept. 2021}
             \resumeItemListStart
                 \resumeItem{}{Did this.}
                 \resumeItem{}{Did that.}
@@ -893,6 +884,15 @@
             \resumeItemListEnd
 
 
+        \resumeSubheading
+            {Boğaziçi University}{}
+            {BS in Mechanical Engineering}{Sept. 2021}
+            \resumeItemListStart
+                \resumeItem{}{Did this.}
+                \resumeItem{}{Did that.}
+            \resumeItemListEnd
+
+
         \resumeSubheading
             {Boğaziçi University}{Istanbul, Turkey}
             {BS in Mechanical Engineering}{Sept. 2021}
@@ -911,6 +911,10 @@
             {My Project}{}
 
 
+        \resumeNormalSubheading
+            {My Project}{Istanbul, Turkey}
+
+
         \resumeNormalSubheading
             {My Project}{Sept. 2015 to present}
 
@@ -931,52 +935,12 @@
             \resumeItemListEnd
 
 
-        \resumeNormalSubheading
-            {My Project}{Istanbul, Turkey}
-
-
         \resumeNormalSubheading
             {My Project}{Sept. 2015 to present}
 
 
-        \resumeNormalSubheading
-            {My Project}{Sept. 2021}
-
-
-        \resumeNormalSubheading
-            {My Project}{Sept. 2015 to present}
-            \resumeItemListStart
-                \resumeItem{}{Did this.}
-                \resumeItem{}{Did that.}
-            \resumeItemListEnd
-
-
-        \resumeNormalSubheading
-            {My Project}{Sept. 2015 to present}
-
-
-        \resumeNormalSubheading
-            {My Project}{Sept. 2021}
-
-
         \resumeNormalSubheading
             {My Project}{Jan. 2024}
-            \resumeItemListStart
-                \resumeItem{}{Did this.}
-                \resumeItem{}{Did that.}
-            \resumeItemListEnd
-
-
-        \resumeNormalSubheading
-            {My Project}{Jan. 2024}
-
-
-        \resumeNormalSubheading
-            {My Project}{Sept. 2021}
-            \resumeItemListStart
-                \resumeItem{}{Did this.}
-                \resumeItem{}{Did that.}
-            \resumeItemListEnd
 
 
         \resumeNormalSubheading
@@ -991,28 +955,8 @@
             \resumeItemListEnd
 
 
-        \resumeNormalSubheading
-            {My Project}{Sept. 2021}
-
-
         \resumeNormalSubheading
             {My Project}{Sept. 2015 to present}
-            \resumeItemListStart
-                \resumeItem{}{Did this.}
-                \resumeItem{}{Did that.}
-            \resumeItemListEnd
-
-
-        \resumeNormalSubheading
-            {My Project}{Sept. 2015 to present}
-
-
-        \resumeNormalSubheading
-            {My Project}{Sept. 2021}
-            \resumeItemListStart
-                \resumeItem{}{Did this.}
-                \resumeItem{}{Did that.}
-            \resumeItemListEnd
 
 
         \resumeNormalSubheading
@@ -1029,6 +973,34 @@
 
         \resumeNormalSubheading
             {My Project}{Sept. 2021}
+
+
+        \resumeNormalSubheading
+            {My Project}{Jan. 2024}
+            \resumeItemListStart
+                \resumeItem{}{Did this.}
+                \resumeItem{}{Did that.}
+            \resumeItemListEnd
+
+
+        \resumeNormalSubheading
+            {My Project}{Sept. 2021}
+            \resumeItemListStart
+                \resumeItem{}{Did this.}
+                \resumeItem{}{Did that.}
+            \resumeItemListEnd
+
+
+        \resumeNormalSubheading
+            {My Project}{Sept. 2015 to present}
+
+
+        \resumeNormalSubheading
+            {My Project}{Sept. 2021}
+
+
+        \resumeNormalSubheading
+            {My Project}{Sept. 2015 to present}
             \resumeItemListStart
                 \resumeItem{}{Did this.}
                 \resumeItem{}{Did that.}
@@ -1055,6 +1027,26 @@
             \resumeItemListEnd
 
 
+        \resumeNormalSubheading
+            {My Project}{Sept. 2021}
+
+
+        \resumeNormalSubheading
+            {My Project}{Sept. 2015 to present}
+            \resumeItemListStart
+                \resumeItem{}{Did this.}
+                \resumeItem{}{Did that.}
+            \resumeItemListEnd
+
+
+        \resumeNormalSubheading
+            {My Project}{Sept. 2021}
+            \resumeItemListStart
+                \resumeItem{}{Did this.}
+                \resumeItem{}{Did that.}
+            \resumeItemListEnd
+
+
         \resumeNormalSubheading
             {My Project}{Sept. 2021}
             \resumeItemListStart
@@ -1099,6 +1091,14 @@
             \resumeItemListEnd
 
 
+        \resumeNormalSubheading
+            {My Project}{Sept. 2021}
+            \resumeItemListStart
+                \resumeItem{}{Did this.}
+                \resumeItem{}{Did that.}
+            \resumeItemListEnd
+
+
 
     \resumeSubHeadingListEnd
     \section{One Line Entries}
diff --git a/tests/testdata/test_generate_markdown_file/classic_empty/None_CV.md b/tests/testdata/test_generate_markdown_file/classic_empty.md
similarity index 100%
rename from tests/testdata/test_generate_markdown_file/classic_empty/None_CV.md
rename to tests/testdata/test_generate_markdown_file/classic_empty.md
diff --git a/tests/testdata/test_generate_markdown_file/moderncv_filled/John_Doe_CV.md b/tests/testdata/test_generate_markdown_file/classic_filled.md
similarity index 100%
rename from tests/testdata/test_generate_markdown_file/moderncv_filled/John_Doe_CV.md
rename to tests/testdata/test_generate_markdown_file/classic_filled.md
index ceb9a470..0eb13074 100644
--- a/tests/testdata/test_generate_markdown_file/moderncv_filled/John_Doe_CV.md
+++ b/tests/testdata/test_generate_markdown_file/classic_filled.md
@@ -49,6 +49,11 @@ My Text Entry with some **markdown** and [links](https://example.com)!
 
 
 
+## Some Company, Software Engineer
+
+
+- Istanbul, Turkey 
+
 ## Some Company, Software Engineer
 
 - Sept. 2015 to present 
@@ -73,8 +78,25 @@ My Text Entry with some **markdown** and [links](https://example.com)!
 
 ## Some Company, Software Engineer
 
+- Sept. 2015 to present 
+- Istanbul, Turkey 
+
+## Some Company, Software Engineer
+
+- Jan. 2024 
+- Istanbul, Turkey 
+
+## Some Company, Software Engineer
+
+- Sept. 2021 
+- Istanbul, Turkey 
+
+## Some Company, Software Engineer
+
 
 - Istanbul, Turkey 
+- Did this.
+- Did that.
 
 ## Some Company, Software Engineer
 
@@ -95,11 +117,6 @@ My Text Entry with some **markdown** and [links](https://example.com)!
 
 ## Some Company, Software Engineer
 
-- Sept. 2015 to present 
-- Istanbul, Turkey 
-
-## Some Company, Software Engineer
-
 - Sept. 2021 
 
 
@@ -112,11 +129,6 @@ My Text Entry with some **markdown** and [links](https://example.com)!
 
 ## Some Company, Software Engineer
 
-- Jan. 2024 
-- Istanbul, Turkey 
-
-## Some Company, Software Engineer
-
 - Sept. 2021 
 
 - Did this.
@@ -124,42 +136,11 @@ My Text Entry with some **markdown** and [links](https://example.com)!
 
 ## Some Company, Software Engineer
 
-- Sept. 2021 
-- Istanbul, Turkey 
-
-## Some Company, Software Engineer
-
-
-- Istanbul, Turkey 
-- Did this.
-- Did that.
-
-## Some Company, Software Engineer
-
-- Sept. 2021 
-
-
-## Some Company, Software Engineer
-
-- Sept. 2015 to present 
-
-- Did this.
-- Did that.
-
-## Some Company, Software Engineer
-
 - Sept. 2015 to present 
 - Istanbul, Turkey 
 
 ## Some Company, Software Engineer
 
-- Sept. 2021 
-
-- Did this.
-- Did that.
-
-## Some Company, Software Engineer
-
 - Sept. 2021 
 - Istanbul, Turkey 
 
@@ -172,13 +153,6 @@ My Text Entry with some **markdown** and [links](https://example.com)!
 
 ## Some Company, Software Engineer
 
-- Sept. 2021 
-
-- Did this.
-- Did that.
-
-## Some Company, Software Engineer
-
 - Sept. 2021 
 - Istanbul, Turkey 
 
@@ -200,6 +174,25 @@ My Text Entry with some **markdown** and [links](https://example.com)!
 
 - Sept. 2021 
 
+
+## Some Company, Software Engineer
+
+- Sept. 2015 to present 
+
+- Did this.
+- Did that.
+
+## Some Company, Software Engineer
+
+- Sept. 2021 
+
+- Did this.
+- Did that.
+
+## Some Company, Software Engineer
+
+- Sept. 2021 
+
 - Did this.
 - Did that.
 
@@ -231,6 +224,13 @@ My Text Entry with some **markdown** and [links](https://example.com)!
 
 ## Some Company, Software Engineer
 
+- Sept. 2021 
+
+- Did this.
+- Did that.
+
+## Some Company, Software Engineer
+
 - Sept. 2021 
 - Istanbul, Turkey 
 - Did this.
@@ -243,6 +243,11 @@ My Text Entry with some **markdown** and [links](https://example.com)!
 
 
 
+## Boğaziçi University, Mechanical Engineering
+
+
+- Istanbul, Turkey 
+
 ## Boğaziçi University, Mechanical Engineering
 
 - Sept. 2015 to present 
@@ -265,16 +270,38 @@ My Text Entry with some **markdown** and [links](https://example.com)!
 - Did this.
 - Did that.
 
-## Boğaziçi University, Mechanical Engineering
-
-
-- Istanbul, Turkey 
-
 ## Boğaziçi University, BS in Mechanical Engineering
 
 
 
 
+## Boğaziçi University, Mechanical Engineering
+
+- Sept. 2015 to present 
+- Istanbul, Turkey 
+
+## Boğaziçi University, Mechanical Engineering
+
+- Jan. 2024 
+- Istanbul, Turkey 
+
+## Boğaziçi University, Mechanical Engineering
+
+- Sept. 2021 
+- Istanbul, Turkey 
+
+## Boğaziçi University, Mechanical Engineering
+
+
+- Istanbul, Turkey 
+- Did this.
+- Did that.
+
+## Boğaziçi University, BS in Mechanical Engineering
+
+
+- Istanbul, Turkey 
+
 ## Boğaziçi University, Mechanical Engineering
 
 - Sept. 2015 to present 
@@ -292,11 +319,6 @@ My Text Entry with some **markdown** and [links](https://example.com)!
 - Did this.
 - Did that.
 
-## Boğaziçi University, Mechanical Engineering
-
-- Sept. 2015 to present 
-- Istanbul, Turkey 
-
 ## Boğaziçi University, BS in Mechanical Engineering
 
 - Sept. 2015 to present 
@@ -314,11 +336,6 @@ My Text Entry with some **markdown** and [links](https://example.com)!
 - Did this.
 - Did that.
 
-## Boğaziçi University, Mechanical Engineering
-
-- Jan. 2024 
-- Istanbul, Turkey 
-
 ## Boğaziçi University, BS in Mechanical Engineering
 
 - Jan. 2024 
@@ -331,44 +348,15 @@ My Text Entry with some **markdown** and [links](https://example.com)!
 - Did this.
 - Did that.
 
-## Boğaziçi University, Mechanical Engineering
-
-- Sept. 2021 
-- Istanbul, Turkey 
-
 ## Boğaziçi University, BS in Mechanical Engineering
 
 - Sept. 2021 
 
 
-## Boğaziçi University, Mechanical Engineering
-
-
-- Istanbul, Turkey 
-- Did this.
-- Did that.
-
 ## Boğaziçi University, BS in Mechanical Engineering
 
 
 
-- Did this.
-- Did that.
-
-## Boğaziçi University, BS in Mechanical Engineering
-
-
-- Istanbul, Turkey 
-
-## Boğaziçi University, Mechanical Engineering
-
-- Sept. 2021 
-
-
-## Boğaziçi University, Mechanical Engineering
-
-- Sept. 2015 to present 
-
 - Did this.
 - Did that.
 
@@ -377,28 +365,11 @@ My Text Entry with some **markdown** and [links](https://example.com)!
 - Sept. 2015 to present 
 - Istanbul, Turkey 
 
-## Boğaziçi University, BS in Mechanical Engineering
-
-- Sept. 2015 to present 
-
-
-## Boğaziçi University, Mechanical Engineering
-
-- Sept. 2021 
-
-- Did this.
-- Did that.
-
 ## Boğaziçi University, Mechanical Engineering
 
 - Sept. 2021 
 - Istanbul, Turkey 
 
-## Boğaziçi University, BS in Mechanical Engineering
-
-- Sept. 2021 
-
-
 ## Boğaziçi University, Mechanical Engineering
 
 - Sept. 2015 to present 
@@ -408,33 +379,14 @@ My Text Entry with some **markdown** and [links](https://example.com)!
 
 ## Boğaziçi University, BS in Mechanical Engineering
 
-- Sept. 2015 to present 
-
-- Did this.
-- Did that.
-
-## Boğaziçi University, BS in Mechanical Engineering
-
 - Sept. 2015 to present 
 - Istanbul, Turkey 
 
 ## Boğaziçi University, Mechanical Engineering
 
-- Sept. 2021 
-
-- Did this.
-- Did that.
-
-## Boğaziçi University, Mechanical Engineering
-
 - Sept. 2021 
 - Istanbul, Turkey 
 
-## Boğaziçi University, BS in Mechanical Engineering
-
-- Sept. 2021 
-
-
 ## Boğaziçi University, Mechanical Engineering
 
 - Jan. 2024 
@@ -445,43 +397,84 @@ My Text Entry with some **markdown** and [links](https://example.com)!
 ## Boğaziçi University, BS in Mechanical Engineering
 
 - Jan. 2024 
+- Istanbul, Turkey 
+
+## Boğaziçi University, Mechanical Engineering
+
+- Sept. 2021 
+- Istanbul, Turkey 
+- Did this.
+- Did that.
+
+## Boğaziçi University, BS in Mechanical Engineering
+
+- Sept. 2021 
+- Istanbul, Turkey 
+
+## Boğaziçi University, BS in Mechanical Engineering
+
+
+- Istanbul, Turkey 
+- Did this.
+- Did that.
+
+## Boğaziçi University, Mechanical Engineering
+
+- Sept. 2021 
+
+
+## Boğaziçi University, Mechanical Engineering
+
+- Sept. 2015 to present 
 
 - Did this.
 - Did that.
 
+## Boğaziçi University, BS in Mechanical Engineering
+
+- Sept. 2015 to present 
+
+
+## Boğaziçi University, Mechanical Engineering
+
+- Sept. 2021 
+
+- Did this.
+- Did that.
+
+## Boğaziçi University, BS in Mechanical Engineering
+
+- Sept. 2021 
+
+
+## Boğaziçi University, BS in Mechanical Engineering
+
+- Sept. 2015 to present 
+
+- Did this.
+- Did that.
+
+## Boğaziçi University, Mechanical Engineering
+
+- Sept. 2021 
+
+- Did this.
+- Did that.
+
+## Boğaziçi University, BS in Mechanical Engineering
+
+- Sept. 2021 
+
+
 ## Boğaziçi University, BS in Mechanical Engineering
 
 - Jan. 2024 
-- Istanbul, Turkey 
-
-## Boğaziçi University, Mechanical Engineering
-
-- Sept. 2021 
-- Istanbul, Turkey 
-- Did this.
-- Did that.
-
-## Boğaziçi University, BS in Mechanical Engineering
-
-- Sept. 2021 
 
 - Did this.
 - Did that.
 
 ## Boğaziçi University, BS in Mechanical Engineering
 
-- Sept. 2021 
-- Istanbul, Turkey 
-
-## Boğaziçi University, BS in Mechanical Engineering
-
-
-- Istanbul, Turkey 
-- Did this.
-- Did that.
-
-## Boğaziçi University, Mechanical Engineering
-
 - Sept. 2021 
 
 - Did this.
@@ -492,11 +485,6 @@ My Text Entry with some **markdown** and [links](https://example.com)!
 - Sept. 2021 
 - Istanbul, Turkey 
 
-## Boğaziçi University, BS in Mechanical Engineering
-
-- Sept. 2021 
-
-
 ## Boğaziçi University, Mechanical Engineering
 
 - Sept. 2015 to present 
@@ -506,13 +494,6 @@ My Text Entry with some **markdown** and [links](https://example.com)!
 
 ## Boğaziçi University, BS in Mechanical Engineering
 
-- Sept. 2015 to present 
-
-- Did this.
-- Did that.
-
-## Boğaziçi University, BS in Mechanical Engineering
-
 - Sept. 2015 to present 
 - Istanbul, Turkey 
 
@@ -525,13 +506,6 @@ My Text Entry with some **markdown** and [links](https://example.com)!
 
 ## Boğaziçi University, BS in Mechanical Engineering
 
-- Sept. 2021 
-
-- Did this.
-- Did that.
-
-## Boğaziçi University, BS in Mechanical Engineering
-
 - Sept. 2021 
 - Istanbul, Turkey 
 
@@ -551,13 +525,6 @@ My Text Entry with some **markdown** and [links](https://example.com)!
 
 ## Boğaziçi University, BS in Mechanical Engineering
 
-- Sept. 2021 
-
-- Did this.
-- Did that.
-
-## Boğaziçi University, BS in Mechanical Engineering
-
 - Sept. 2021 
 - Istanbul, Turkey 
 
@@ -578,7 +545,7 @@ My Text Entry with some **markdown** and [links](https://example.com)!
 ## Boğaziçi University, Mechanical Engineering
 
 - Sept. 2021 
-- Istanbul, Turkey 
+
 - Did this.
 - Did that.
 
@@ -586,6 +553,32 @@ My Text Entry with some **markdown** and [links](https://example.com)!
 
 - Sept. 2021 
 
+
+## Boğaziçi University, BS in Mechanical Engineering
+
+- Sept. 2015 to present 
+
+- Did this.
+- Did that.
+
+## Boğaziçi University, BS in Mechanical Engineering
+
+- Sept. 2021 
+
+- Did this.
+- Did that.
+
+## Boğaziçi University, BS in Mechanical Engineering
+
+- Sept. 2021 
+
+- Did this.
+- Did that.
+
+## Boğaziçi University, Mechanical Engineering
+
+- Sept. 2021 
+- Istanbul, Turkey 
 - Did this.
 - Did that.
 
@@ -617,6 +610,13 @@ My Text Entry with some **markdown** and [links](https://example.com)!
 
 ## Boğaziçi University, BS in Mechanical Engineering
 
+- Sept. 2021 
+
+- Did this.
+- Did that.
+
+## Boğaziçi University, BS in Mechanical Engineering
+
 - Sept. 2021 
 - Istanbul, Turkey 
 - Did this.
@@ -629,6 +629,9 @@ My Text Entry with some **markdown** and [links](https://example.com)!
 
 ## My Project
 
+- Istanbul, Turkey 
+## My Project
+
 - Sept. 2015 to present 
 ## My Project
 
@@ -643,7 +646,18 @@ My Text Entry with some **markdown** and [links](https://example.com)!
 
 ## My Project
 
-- Istanbul, Turkey 
+- Sept. 2015 to present - Istanbul, Turkey 
+## My Project
+
+- Jan. 2024 - Istanbul, Turkey 
+## My Project
+
+- Sept. 2021 - Istanbul, Turkey 
+## My Project
+
+- Istanbul, Turkey - Did this.
+- Did that.
+
 ## My Project
 
 - Sept. 2015 to present 
@@ -657,9 +671,6 @@ My Text Entry with some **markdown** and [links](https://example.com)!
 
 ## My Project
 
-- Sept. 2015 to present - Istanbul, Turkey 
-## My Project
-
 - Sept. 2021 
 ## My Project
 
@@ -668,38 +679,14 @@ My Text Entry with some **markdown** and [links](https://example.com)!
 
 ## My Project
 
-- Jan. 2024 - Istanbul, Turkey 
-## My Project
-
 - Sept. 2021 - Did this.
 - Did that.
 
 ## My Project
 
-- Sept. 2021 - Istanbul, Turkey 
-## My Project
-
-- Istanbul, Turkey - Did this.
-- Did that.
-
-## My Project
-
-- Sept. 2021 
-## My Project
-
-- Sept. 2015 to present - Did this.
-- Did that.
-
-## My Project
-
 - Sept. 2015 to present - Istanbul, Turkey 
 ## My Project
 
-- Sept. 2021 - Did this.
-- Did that.
-
-## My Project
-
 - Sept. 2021 - Istanbul, Turkey 
 ## My Project
 
@@ -708,11 +695,6 @@ My Text Entry with some **markdown** and [links](https://example.com)!
 
 ## My Project
 
-- Sept. 2021 - Did this.
-- Did that.
-
-## My Project
-
 - Sept. 2021 - Istanbul, Turkey 
 ## My Project
 
@@ -726,6 +708,19 @@ My Text Entry with some **markdown** and [links](https://example.com)!
 
 ## My Project
 
+- Sept. 2021 
+## My Project
+
+- Sept. 2015 to present - Did this.
+- Did that.
+
+## My Project
+
+- Sept. 2021 - Did this.
+- Did that.
+
+## My Project
+
 - Sept. 2021 - Did this.
 - Did that.
 
@@ -749,6 +744,11 @@ My Text Entry with some **markdown** and [links](https://example.com)!
 
 ## My Project
 
+- Sept. 2021 - Did this.
+- Did that.
+
+## My Project
+
 - Sept. 2021 - Istanbul, Turkey - Did this.
 - Did that.
 
diff --git a/tests/testdata/test_generate_markdown_file/moderncv_empty/None_CV.md b/tests/testdata/test_generate_markdown_file/moderncv_empty.md
similarity index 100%
rename from tests/testdata/test_generate_markdown_file/moderncv_empty/None_CV.md
rename to tests/testdata/test_generate_markdown_file/moderncv_empty.md
diff --git a/tests/testdata/test_generate_markdown_file/sb2nov_filled/John_Doe_CV.md b/tests/testdata/test_generate_markdown_file/moderncv_filled.md
similarity index 100%
rename from tests/testdata/test_generate_markdown_file/sb2nov_filled/John_Doe_CV.md
rename to tests/testdata/test_generate_markdown_file/moderncv_filled.md
index ceb9a470..0eb13074 100644
--- a/tests/testdata/test_generate_markdown_file/sb2nov_filled/John_Doe_CV.md
+++ b/tests/testdata/test_generate_markdown_file/moderncv_filled.md
@@ -49,6 +49,11 @@ My Text Entry with some **markdown** and [links](https://example.com)!
 
 
 
+## Some Company, Software Engineer
+
+
+- Istanbul, Turkey 
+
 ## Some Company, Software Engineer
 
 - Sept. 2015 to present 
@@ -73,8 +78,25 @@ My Text Entry with some **markdown** and [links](https://example.com)!
 
 ## Some Company, Software Engineer
 
+- Sept. 2015 to present 
+- Istanbul, Turkey 
+
+## Some Company, Software Engineer
+
+- Jan. 2024 
+- Istanbul, Turkey 
+
+## Some Company, Software Engineer
+
+- Sept. 2021 
+- Istanbul, Turkey 
+
+## Some Company, Software Engineer
+
 
 - Istanbul, Turkey 
+- Did this.
+- Did that.
 
 ## Some Company, Software Engineer
 
@@ -95,11 +117,6 @@ My Text Entry with some **markdown** and [links](https://example.com)!
 
 ## Some Company, Software Engineer
 
-- Sept. 2015 to present 
-- Istanbul, Turkey 
-
-## Some Company, Software Engineer
-
 - Sept. 2021 
 
 
@@ -112,11 +129,6 @@ My Text Entry with some **markdown** and [links](https://example.com)!
 
 ## Some Company, Software Engineer
 
-- Jan. 2024 
-- Istanbul, Turkey 
-
-## Some Company, Software Engineer
-
 - Sept. 2021 
 
 - Did this.
@@ -124,42 +136,11 @@ My Text Entry with some **markdown** and [links](https://example.com)!
 
 ## Some Company, Software Engineer
 
-- Sept. 2021 
-- Istanbul, Turkey 
-
-## Some Company, Software Engineer
-
-
-- Istanbul, Turkey 
-- Did this.
-- Did that.
-
-## Some Company, Software Engineer
-
-- Sept. 2021 
-
-
-## Some Company, Software Engineer
-
-- Sept. 2015 to present 
-
-- Did this.
-- Did that.
-
-## Some Company, Software Engineer
-
 - Sept. 2015 to present 
 - Istanbul, Turkey 
 
 ## Some Company, Software Engineer
 
-- Sept. 2021 
-
-- Did this.
-- Did that.
-
-## Some Company, Software Engineer
-
 - Sept. 2021 
 - Istanbul, Turkey 
 
@@ -172,13 +153,6 @@ My Text Entry with some **markdown** and [links](https://example.com)!
 
 ## Some Company, Software Engineer
 
-- Sept. 2021 
-
-- Did this.
-- Did that.
-
-## Some Company, Software Engineer
-
 - Sept. 2021 
 - Istanbul, Turkey 
 
@@ -200,6 +174,25 @@ My Text Entry with some **markdown** and [links](https://example.com)!
 
 - Sept. 2021 
 
+
+## Some Company, Software Engineer
+
+- Sept. 2015 to present 
+
+- Did this.
+- Did that.
+
+## Some Company, Software Engineer
+
+- Sept. 2021 
+
+- Did this.
+- Did that.
+
+## Some Company, Software Engineer
+
+- Sept. 2021 
+
 - Did this.
 - Did that.
 
@@ -231,6 +224,13 @@ My Text Entry with some **markdown** and [links](https://example.com)!
 
 ## Some Company, Software Engineer
 
+- Sept. 2021 
+
+- Did this.
+- Did that.
+
+## Some Company, Software Engineer
+
 - Sept. 2021 
 - Istanbul, Turkey 
 - Did this.
@@ -243,6 +243,11 @@ My Text Entry with some **markdown** and [links](https://example.com)!
 
 
 
+## Boğaziçi University, Mechanical Engineering
+
+
+- Istanbul, Turkey 
+
 ## Boğaziçi University, Mechanical Engineering
 
 - Sept. 2015 to present 
@@ -265,16 +270,38 @@ My Text Entry with some **markdown** and [links](https://example.com)!
 - Did this.
 - Did that.
 
-## Boğaziçi University, Mechanical Engineering
-
-
-- Istanbul, Turkey 
-
 ## Boğaziçi University, BS in Mechanical Engineering
 
 
 
 
+## Boğaziçi University, Mechanical Engineering
+
+- Sept. 2015 to present 
+- Istanbul, Turkey 
+
+## Boğaziçi University, Mechanical Engineering
+
+- Jan. 2024 
+- Istanbul, Turkey 
+
+## Boğaziçi University, Mechanical Engineering
+
+- Sept. 2021 
+- Istanbul, Turkey 
+
+## Boğaziçi University, Mechanical Engineering
+
+
+- Istanbul, Turkey 
+- Did this.
+- Did that.
+
+## Boğaziçi University, BS in Mechanical Engineering
+
+
+- Istanbul, Turkey 
+
 ## Boğaziçi University, Mechanical Engineering
 
 - Sept. 2015 to present 
@@ -292,11 +319,6 @@ My Text Entry with some **markdown** and [links](https://example.com)!
 - Did this.
 - Did that.
 
-## Boğaziçi University, Mechanical Engineering
-
-- Sept. 2015 to present 
-- Istanbul, Turkey 
-
 ## Boğaziçi University, BS in Mechanical Engineering
 
 - Sept. 2015 to present 
@@ -314,11 +336,6 @@ My Text Entry with some **markdown** and [links](https://example.com)!
 - Did this.
 - Did that.
 
-## Boğaziçi University, Mechanical Engineering
-
-- Jan. 2024 
-- Istanbul, Turkey 
-
 ## Boğaziçi University, BS in Mechanical Engineering
 
 - Jan. 2024 
@@ -331,44 +348,15 @@ My Text Entry with some **markdown** and [links](https://example.com)!
 - Did this.
 - Did that.
 
-## Boğaziçi University, Mechanical Engineering
-
-- Sept. 2021 
-- Istanbul, Turkey 
-
 ## Boğaziçi University, BS in Mechanical Engineering
 
 - Sept. 2021 
 
 
-## Boğaziçi University, Mechanical Engineering
-
-
-- Istanbul, Turkey 
-- Did this.
-- Did that.
-
 ## Boğaziçi University, BS in Mechanical Engineering
 
 
 
-- Did this.
-- Did that.
-
-## Boğaziçi University, BS in Mechanical Engineering
-
-
-- Istanbul, Turkey 
-
-## Boğaziçi University, Mechanical Engineering
-
-- Sept. 2021 
-
-
-## Boğaziçi University, Mechanical Engineering
-
-- Sept. 2015 to present 
-
 - Did this.
 - Did that.
 
@@ -377,28 +365,11 @@ My Text Entry with some **markdown** and [links](https://example.com)!
 - Sept. 2015 to present 
 - Istanbul, Turkey 
 
-## Boğaziçi University, BS in Mechanical Engineering
-
-- Sept. 2015 to present 
-
-
-## Boğaziçi University, Mechanical Engineering
-
-- Sept. 2021 
-
-- Did this.
-- Did that.
-
 ## Boğaziçi University, Mechanical Engineering
 
 - Sept. 2021 
 - Istanbul, Turkey 
 
-## Boğaziçi University, BS in Mechanical Engineering
-
-- Sept. 2021 
-
-
 ## Boğaziçi University, Mechanical Engineering
 
 - Sept. 2015 to present 
@@ -408,33 +379,14 @@ My Text Entry with some **markdown** and [links](https://example.com)!
 
 ## Boğaziçi University, BS in Mechanical Engineering
 
-- Sept. 2015 to present 
-
-- Did this.
-- Did that.
-
-## Boğaziçi University, BS in Mechanical Engineering
-
 - Sept. 2015 to present 
 - Istanbul, Turkey 
 
 ## Boğaziçi University, Mechanical Engineering
 
-- Sept. 2021 
-
-- Did this.
-- Did that.
-
-## Boğaziçi University, Mechanical Engineering
-
 - Sept. 2021 
 - Istanbul, Turkey 
 
-## Boğaziçi University, BS in Mechanical Engineering
-
-- Sept. 2021 
-
-
 ## Boğaziçi University, Mechanical Engineering
 
 - Jan. 2024 
@@ -445,43 +397,84 @@ My Text Entry with some **markdown** and [links](https://example.com)!
 ## Boğaziçi University, BS in Mechanical Engineering
 
 - Jan. 2024 
+- Istanbul, Turkey 
+
+## Boğaziçi University, Mechanical Engineering
+
+- Sept. 2021 
+- Istanbul, Turkey 
+- Did this.
+- Did that.
+
+## Boğaziçi University, BS in Mechanical Engineering
+
+- Sept. 2021 
+- Istanbul, Turkey 
+
+## Boğaziçi University, BS in Mechanical Engineering
+
+
+- Istanbul, Turkey 
+- Did this.
+- Did that.
+
+## Boğaziçi University, Mechanical Engineering
+
+- Sept. 2021 
+
+
+## Boğaziçi University, Mechanical Engineering
+
+- Sept. 2015 to present 
 
 - Did this.
 - Did that.
 
+## Boğaziçi University, BS in Mechanical Engineering
+
+- Sept. 2015 to present 
+
+
+## Boğaziçi University, Mechanical Engineering
+
+- Sept. 2021 
+
+- Did this.
+- Did that.
+
+## Boğaziçi University, BS in Mechanical Engineering
+
+- Sept. 2021 
+
+
+## Boğaziçi University, BS in Mechanical Engineering
+
+- Sept. 2015 to present 
+
+- Did this.
+- Did that.
+
+## Boğaziçi University, Mechanical Engineering
+
+- Sept. 2021 
+
+- Did this.
+- Did that.
+
+## Boğaziçi University, BS in Mechanical Engineering
+
+- Sept. 2021 
+
+
 ## Boğaziçi University, BS in Mechanical Engineering
 
 - Jan. 2024 
-- Istanbul, Turkey 
-
-## Boğaziçi University, Mechanical Engineering
-
-- Sept. 2021 
-- Istanbul, Turkey 
-- Did this.
-- Did that.
-
-## Boğaziçi University, BS in Mechanical Engineering
-
-- Sept. 2021 
 
 - Did this.
 - Did that.
 
 ## Boğaziçi University, BS in Mechanical Engineering
 
-- Sept. 2021 
-- Istanbul, Turkey 
-
-## Boğaziçi University, BS in Mechanical Engineering
-
-
-- Istanbul, Turkey 
-- Did this.
-- Did that.
-
-## Boğaziçi University, Mechanical Engineering
-
 - Sept. 2021 
 
 - Did this.
@@ -492,11 +485,6 @@ My Text Entry with some **markdown** and [links](https://example.com)!
 - Sept. 2021 
 - Istanbul, Turkey 
 
-## Boğaziçi University, BS in Mechanical Engineering
-
-- Sept. 2021 
-
-
 ## Boğaziçi University, Mechanical Engineering
 
 - Sept. 2015 to present 
@@ -506,13 +494,6 @@ My Text Entry with some **markdown** and [links](https://example.com)!
 
 ## Boğaziçi University, BS in Mechanical Engineering
 
-- Sept. 2015 to present 
-
-- Did this.
-- Did that.
-
-## Boğaziçi University, BS in Mechanical Engineering
-
 - Sept. 2015 to present 
 - Istanbul, Turkey 
 
@@ -525,13 +506,6 @@ My Text Entry with some **markdown** and [links](https://example.com)!
 
 ## Boğaziçi University, BS in Mechanical Engineering
 
-- Sept. 2021 
-
-- Did this.
-- Did that.
-
-## Boğaziçi University, BS in Mechanical Engineering
-
 - Sept. 2021 
 - Istanbul, Turkey 
 
@@ -551,13 +525,6 @@ My Text Entry with some **markdown** and [links](https://example.com)!
 
 ## Boğaziçi University, BS in Mechanical Engineering
 
-- Sept. 2021 
-
-- Did this.
-- Did that.
-
-## Boğaziçi University, BS in Mechanical Engineering
-
 - Sept. 2021 
 - Istanbul, Turkey 
 
@@ -578,7 +545,7 @@ My Text Entry with some **markdown** and [links](https://example.com)!
 ## Boğaziçi University, Mechanical Engineering
 
 - Sept. 2021 
-- Istanbul, Turkey 
+
 - Did this.
 - Did that.
 
@@ -586,6 +553,32 @@ My Text Entry with some **markdown** and [links](https://example.com)!
 
 - Sept. 2021 
 
+
+## Boğaziçi University, BS in Mechanical Engineering
+
+- Sept. 2015 to present 
+
+- Did this.
+- Did that.
+
+## Boğaziçi University, BS in Mechanical Engineering
+
+- Sept. 2021 
+
+- Did this.
+- Did that.
+
+## Boğaziçi University, BS in Mechanical Engineering
+
+- Sept. 2021 
+
+- Did this.
+- Did that.
+
+## Boğaziçi University, Mechanical Engineering
+
+- Sept. 2021 
+- Istanbul, Turkey 
 - Did this.
 - Did that.
 
@@ -617,6 +610,13 @@ My Text Entry with some **markdown** and [links](https://example.com)!
 
 ## Boğaziçi University, BS in Mechanical Engineering
 
+- Sept. 2021 
+
+- Did this.
+- Did that.
+
+## Boğaziçi University, BS in Mechanical Engineering
+
 - Sept. 2021 
 - Istanbul, Turkey 
 - Did this.
@@ -629,6 +629,9 @@ My Text Entry with some **markdown** and [links](https://example.com)!
 
 ## My Project
 
+- Istanbul, Turkey 
+## My Project
+
 - Sept. 2015 to present 
 ## My Project
 
@@ -643,7 +646,18 @@ My Text Entry with some **markdown** and [links](https://example.com)!
 
 ## My Project
 
-- Istanbul, Turkey 
+- Sept. 2015 to present - Istanbul, Turkey 
+## My Project
+
+- Jan. 2024 - Istanbul, Turkey 
+## My Project
+
+- Sept. 2021 - Istanbul, Turkey 
+## My Project
+
+- Istanbul, Turkey - Did this.
+- Did that.
+
 ## My Project
 
 - Sept. 2015 to present 
@@ -657,9 +671,6 @@ My Text Entry with some **markdown** and [links](https://example.com)!
 
 ## My Project
 
-- Sept. 2015 to present - Istanbul, Turkey 
-## My Project
-
 - Sept. 2021 
 ## My Project
 
@@ -668,38 +679,14 @@ My Text Entry with some **markdown** and [links](https://example.com)!
 
 ## My Project
 
-- Jan. 2024 - Istanbul, Turkey 
-## My Project
-
 - Sept. 2021 - Did this.
 - Did that.
 
 ## My Project
 
-- Sept. 2021 - Istanbul, Turkey 
-## My Project
-
-- Istanbul, Turkey - Did this.
-- Did that.
-
-## My Project
-
-- Sept. 2021 
-## My Project
-
-- Sept. 2015 to present - Did this.
-- Did that.
-
-## My Project
-
 - Sept. 2015 to present - Istanbul, Turkey 
 ## My Project
 
-- Sept. 2021 - Did this.
-- Did that.
-
-## My Project
-
 - Sept. 2021 - Istanbul, Turkey 
 ## My Project
 
@@ -708,11 +695,6 @@ My Text Entry with some **markdown** and [links](https://example.com)!
 
 ## My Project
 
-- Sept. 2021 - Did this.
-- Did that.
-
-## My Project
-
 - Sept. 2021 - Istanbul, Turkey 
 ## My Project
 
@@ -726,6 +708,19 @@ My Text Entry with some **markdown** and [links](https://example.com)!
 
 ## My Project
 
+- Sept. 2021 
+## My Project
+
+- Sept. 2015 to present - Did this.
+- Did that.
+
+## My Project
+
+- Sept. 2021 - Did this.
+- Did that.
+
+## My Project
+
 - Sept. 2021 - Did this.
 - Did that.
 
@@ -749,6 +744,11 @@ My Text Entry with some **markdown** and [links](https://example.com)!
 
 ## My Project
 
+- Sept. 2021 - Did this.
+- Did that.
+
+## My Project
+
 - Sept. 2021 - Istanbul, Turkey - Did this.
 - Did that.
 
diff --git a/tests/testdata/test_generate_markdown_file/sb2nov_empty/None_CV.md b/tests/testdata/test_generate_markdown_file/sb2nov_empty.md
similarity index 100%
rename from tests/testdata/test_generate_markdown_file/sb2nov_empty/None_CV.md
rename to tests/testdata/test_generate_markdown_file/sb2nov_empty.md
diff --git a/tests/testdata/test_generate_markdown_file/classic_filled/John_Doe_CV.md b/tests/testdata/test_generate_markdown_file/sb2nov_filled.md
similarity index 100%
rename from tests/testdata/test_generate_markdown_file/classic_filled/John_Doe_CV.md
rename to tests/testdata/test_generate_markdown_file/sb2nov_filled.md
index ceb9a470..0eb13074 100644
--- a/tests/testdata/test_generate_markdown_file/classic_filled/John_Doe_CV.md
+++ b/tests/testdata/test_generate_markdown_file/sb2nov_filled.md
@@ -49,6 +49,11 @@ My Text Entry with some **markdown** and [links](https://example.com)!
 
 
 
+## Some Company, Software Engineer
+
+
+- Istanbul, Turkey 
+
 ## Some Company, Software Engineer
 
 - Sept. 2015 to present 
@@ -73,8 +78,25 @@ My Text Entry with some **markdown** and [links](https://example.com)!
 
 ## Some Company, Software Engineer
 
+- Sept. 2015 to present 
+- Istanbul, Turkey 
+
+## Some Company, Software Engineer
+
+- Jan. 2024 
+- Istanbul, Turkey 
+
+## Some Company, Software Engineer
+
+- Sept. 2021 
+- Istanbul, Turkey 
+
+## Some Company, Software Engineer
+
 
 - Istanbul, Turkey 
+- Did this.
+- Did that.
 
 ## Some Company, Software Engineer
 
@@ -95,11 +117,6 @@ My Text Entry with some **markdown** and [links](https://example.com)!
 
 ## Some Company, Software Engineer
 
-- Sept. 2015 to present 
-- Istanbul, Turkey 
-
-## Some Company, Software Engineer
-
 - Sept. 2021 
 
 
@@ -112,11 +129,6 @@ My Text Entry with some **markdown** and [links](https://example.com)!
 
 ## Some Company, Software Engineer
 
-- Jan. 2024 
-- Istanbul, Turkey 
-
-## Some Company, Software Engineer
-
 - Sept. 2021 
 
 - Did this.
@@ -124,42 +136,11 @@ My Text Entry with some **markdown** and [links](https://example.com)!
 
 ## Some Company, Software Engineer
 
-- Sept. 2021 
-- Istanbul, Turkey 
-
-## Some Company, Software Engineer
-
-
-- Istanbul, Turkey 
-- Did this.
-- Did that.
-
-## Some Company, Software Engineer
-
-- Sept. 2021 
-
-
-## Some Company, Software Engineer
-
-- Sept. 2015 to present 
-
-- Did this.
-- Did that.
-
-## Some Company, Software Engineer
-
 - Sept. 2015 to present 
 - Istanbul, Turkey 
 
 ## Some Company, Software Engineer
 
-- Sept. 2021 
-
-- Did this.
-- Did that.
-
-## Some Company, Software Engineer
-
 - Sept. 2021 
 - Istanbul, Turkey 
 
@@ -172,13 +153,6 @@ My Text Entry with some **markdown** and [links](https://example.com)!
 
 ## Some Company, Software Engineer
 
-- Sept. 2021 
-
-- Did this.
-- Did that.
-
-## Some Company, Software Engineer
-
 - Sept. 2021 
 - Istanbul, Turkey 
 
@@ -200,6 +174,25 @@ My Text Entry with some **markdown** and [links](https://example.com)!
 
 - Sept. 2021 
 
+
+## Some Company, Software Engineer
+
+- Sept. 2015 to present 
+
+- Did this.
+- Did that.
+
+## Some Company, Software Engineer
+
+- Sept. 2021 
+
+- Did this.
+- Did that.
+
+## Some Company, Software Engineer
+
+- Sept. 2021 
+
 - Did this.
 - Did that.
 
@@ -231,6 +224,13 @@ My Text Entry with some **markdown** and [links](https://example.com)!
 
 ## Some Company, Software Engineer
 
+- Sept. 2021 
+
+- Did this.
+- Did that.
+
+## Some Company, Software Engineer
+
 - Sept. 2021 
 - Istanbul, Turkey 
 - Did this.
@@ -243,6 +243,11 @@ My Text Entry with some **markdown** and [links](https://example.com)!
 
 
 
+## Boğaziçi University, Mechanical Engineering
+
+
+- Istanbul, Turkey 
+
 ## Boğaziçi University, Mechanical Engineering
 
 - Sept. 2015 to present 
@@ -265,16 +270,38 @@ My Text Entry with some **markdown** and [links](https://example.com)!
 - Did this.
 - Did that.
 
-## Boğaziçi University, Mechanical Engineering
-
-
-- Istanbul, Turkey 
-
 ## Boğaziçi University, BS in Mechanical Engineering
 
 
 
 
+## Boğaziçi University, Mechanical Engineering
+
+- Sept. 2015 to present 
+- Istanbul, Turkey 
+
+## Boğaziçi University, Mechanical Engineering
+
+- Jan. 2024 
+- Istanbul, Turkey 
+
+## Boğaziçi University, Mechanical Engineering
+
+- Sept. 2021 
+- Istanbul, Turkey 
+
+## Boğaziçi University, Mechanical Engineering
+
+
+- Istanbul, Turkey 
+- Did this.
+- Did that.
+
+## Boğaziçi University, BS in Mechanical Engineering
+
+
+- Istanbul, Turkey 
+
 ## Boğaziçi University, Mechanical Engineering
 
 - Sept. 2015 to present 
@@ -292,11 +319,6 @@ My Text Entry with some **markdown** and [links](https://example.com)!
 - Did this.
 - Did that.
 
-## Boğaziçi University, Mechanical Engineering
-
-- Sept. 2015 to present 
-- Istanbul, Turkey 
-
 ## Boğaziçi University, BS in Mechanical Engineering
 
 - Sept. 2015 to present 
@@ -314,11 +336,6 @@ My Text Entry with some **markdown** and [links](https://example.com)!
 - Did this.
 - Did that.
 
-## Boğaziçi University, Mechanical Engineering
-
-- Jan. 2024 
-- Istanbul, Turkey 
-
 ## Boğaziçi University, BS in Mechanical Engineering
 
 - Jan. 2024 
@@ -331,44 +348,15 @@ My Text Entry with some **markdown** and [links](https://example.com)!
 - Did this.
 - Did that.
 
-## Boğaziçi University, Mechanical Engineering
-
-- Sept. 2021 
-- Istanbul, Turkey 
-
 ## Boğaziçi University, BS in Mechanical Engineering
 
 - Sept. 2021 
 
 
-## Boğaziçi University, Mechanical Engineering
-
-
-- Istanbul, Turkey 
-- Did this.
-- Did that.
-
 ## Boğaziçi University, BS in Mechanical Engineering
 
 
 
-- Did this.
-- Did that.
-
-## Boğaziçi University, BS in Mechanical Engineering
-
-
-- Istanbul, Turkey 
-
-## Boğaziçi University, Mechanical Engineering
-
-- Sept. 2021 
-
-
-## Boğaziçi University, Mechanical Engineering
-
-- Sept. 2015 to present 
-
 - Did this.
 - Did that.
 
@@ -377,28 +365,11 @@ My Text Entry with some **markdown** and [links](https://example.com)!
 - Sept. 2015 to present 
 - Istanbul, Turkey 
 
-## Boğaziçi University, BS in Mechanical Engineering
-
-- Sept. 2015 to present 
-
-
-## Boğaziçi University, Mechanical Engineering
-
-- Sept. 2021 
-
-- Did this.
-- Did that.
-
 ## Boğaziçi University, Mechanical Engineering
 
 - Sept. 2021 
 - Istanbul, Turkey 
 
-## Boğaziçi University, BS in Mechanical Engineering
-
-- Sept. 2021 
-
-
 ## Boğaziçi University, Mechanical Engineering
 
 - Sept. 2015 to present 
@@ -408,33 +379,14 @@ My Text Entry with some **markdown** and [links](https://example.com)!
 
 ## Boğaziçi University, BS in Mechanical Engineering
 
-- Sept. 2015 to present 
-
-- Did this.
-- Did that.
-
-## Boğaziçi University, BS in Mechanical Engineering
-
 - Sept. 2015 to present 
 - Istanbul, Turkey 
 
 ## Boğaziçi University, Mechanical Engineering
 
-- Sept. 2021 
-
-- Did this.
-- Did that.
-
-## Boğaziçi University, Mechanical Engineering
-
 - Sept. 2021 
 - Istanbul, Turkey 
 
-## Boğaziçi University, BS in Mechanical Engineering
-
-- Sept. 2021 
-
-
 ## Boğaziçi University, Mechanical Engineering
 
 - Jan. 2024 
@@ -445,43 +397,84 @@ My Text Entry with some **markdown** and [links](https://example.com)!
 ## Boğaziçi University, BS in Mechanical Engineering
 
 - Jan. 2024 
+- Istanbul, Turkey 
+
+## Boğaziçi University, Mechanical Engineering
+
+- Sept. 2021 
+- Istanbul, Turkey 
+- Did this.
+- Did that.
+
+## Boğaziçi University, BS in Mechanical Engineering
+
+- Sept. 2021 
+- Istanbul, Turkey 
+
+## Boğaziçi University, BS in Mechanical Engineering
+
+
+- Istanbul, Turkey 
+- Did this.
+- Did that.
+
+## Boğaziçi University, Mechanical Engineering
+
+- Sept. 2021 
+
+
+## Boğaziçi University, Mechanical Engineering
+
+- Sept. 2015 to present 
 
 - Did this.
 - Did that.
 
+## Boğaziçi University, BS in Mechanical Engineering
+
+- Sept. 2015 to present 
+
+
+## Boğaziçi University, Mechanical Engineering
+
+- Sept. 2021 
+
+- Did this.
+- Did that.
+
+## Boğaziçi University, BS in Mechanical Engineering
+
+- Sept. 2021 
+
+
+## Boğaziçi University, BS in Mechanical Engineering
+
+- Sept. 2015 to present 
+
+- Did this.
+- Did that.
+
+## Boğaziçi University, Mechanical Engineering
+
+- Sept. 2021 
+
+- Did this.
+- Did that.
+
+## Boğaziçi University, BS in Mechanical Engineering
+
+- Sept. 2021 
+
+
 ## Boğaziçi University, BS in Mechanical Engineering
 
 - Jan. 2024 
-- Istanbul, Turkey 
-
-## Boğaziçi University, Mechanical Engineering
-
-- Sept. 2021 
-- Istanbul, Turkey 
-- Did this.
-- Did that.
-
-## Boğaziçi University, BS in Mechanical Engineering
-
-- Sept. 2021 
 
 - Did this.
 - Did that.
 
 ## Boğaziçi University, BS in Mechanical Engineering
 
-- Sept. 2021 
-- Istanbul, Turkey 
-
-## Boğaziçi University, BS in Mechanical Engineering
-
-
-- Istanbul, Turkey 
-- Did this.
-- Did that.
-
-## Boğaziçi University, Mechanical Engineering
-
 - Sept. 2021 
 
 - Did this.
@@ -492,11 +485,6 @@ My Text Entry with some **markdown** and [links](https://example.com)!
 - Sept. 2021 
 - Istanbul, Turkey 
 
-## Boğaziçi University, BS in Mechanical Engineering
-
-- Sept. 2021 
-
-
 ## Boğaziçi University, Mechanical Engineering
 
 - Sept. 2015 to present 
@@ -506,13 +494,6 @@ My Text Entry with some **markdown** and [links](https://example.com)!
 
 ## Boğaziçi University, BS in Mechanical Engineering
 
-- Sept. 2015 to present 
-
-- Did this.
-- Did that.
-
-## Boğaziçi University, BS in Mechanical Engineering
-
 - Sept. 2015 to present 
 - Istanbul, Turkey 
 
@@ -525,13 +506,6 @@ My Text Entry with some **markdown** and [links](https://example.com)!
 
 ## Boğaziçi University, BS in Mechanical Engineering
 
-- Sept. 2021 
-
-- Did this.
-- Did that.
-
-## Boğaziçi University, BS in Mechanical Engineering
-
 - Sept. 2021 
 - Istanbul, Turkey 
 
@@ -551,13 +525,6 @@ My Text Entry with some **markdown** and [links](https://example.com)!
 
 ## Boğaziçi University, BS in Mechanical Engineering
 
-- Sept. 2021 
-
-- Did this.
-- Did that.
-
-## Boğaziçi University, BS in Mechanical Engineering
-
 - Sept. 2021 
 - Istanbul, Turkey 
 
@@ -578,7 +545,7 @@ My Text Entry with some **markdown** and [links](https://example.com)!
 ## Boğaziçi University, Mechanical Engineering
 
 - Sept. 2021 
-- Istanbul, Turkey 
+
 - Did this.
 - Did that.
 
@@ -586,6 +553,32 @@ My Text Entry with some **markdown** and [links](https://example.com)!
 
 - Sept. 2021 
 
+
+## Boğaziçi University, BS in Mechanical Engineering
+
+- Sept. 2015 to present 
+
+- Did this.
+- Did that.
+
+## Boğaziçi University, BS in Mechanical Engineering
+
+- Sept. 2021 
+
+- Did this.
+- Did that.
+
+## Boğaziçi University, BS in Mechanical Engineering
+
+- Sept. 2021 
+
+- Did this.
+- Did that.
+
+## Boğaziçi University, Mechanical Engineering
+
+- Sept. 2021 
+- Istanbul, Turkey 
 - Did this.
 - Did that.
 
@@ -617,6 +610,13 @@ My Text Entry with some **markdown** and [links](https://example.com)!
 
 ## Boğaziçi University, BS in Mechanical Engineering
 
+- Sept. 2021 
+
+- Did this.
+- Did that.
+
+## Boğaziçi University, BS in Mechanical Engineering
+
 - Sept. 2021 
 - Istanbul, Turkey 
 - Did this.
@@ -629,6 +629,9 @@ My Text Entry with some **markdown** and [links](https://example.com)!
 
 ## My Project
 
+- Istanbul, Turkey 
+## My Project
+
 - Sept. 2015 to present 
 ## My Project
 
@@ -643,7 +646,18 @@ My Text Entry with some **markdown** and [links](https://example.com)!
 
 ## My Project
 
-- Istanbul, Turkey 
+- Sept. 2015 to present - Istanbul, Turkey 
+## My Project
+
+- Jan. 2024 - Istanbul, Turkey 
+## My Project
+
+- Sept. 2021 - Istanbul, Turkey 
+## My Project
+
+- Istanbul, Turkey - Did this.
+- Did that.
+
 ## My Project
 
 - Sept. 2015 to present 
@@ -657,9 +671,6 @@ My Text Entry with some **markdown** and [links](https://example.com)!
 
 ## My Project
 
-- Sept. 2015 to present - Istanbul, Turkey 
-## My Project
-
 - Sept. 2021 
 ## My Project
 
@@ -668,38 +679,14 @@ My Text Entry with some **markdown** and [links](https://example.com)!
 
 ## My Project
 
-- Jan. 2024 - Istanbul, Turkey 
-## My Project
-
 - Sept. 2021 - Did this.
 - Did that.
 
 ## My Project
 
-- Sept. 2021 - Istanbul, Turkey 
-## My Project
-
-- Istanbul, Turkey - Did this.
-- Did that.
-
-## My Project
-
-- Sept. 2021 
-## My Project
-
-- Sept. 2015 to present - Did this.
-- Did that.
-
-## My Project
-
 - Sept. 2015 to present - Istanbul, Turkey 
 ## My Project
 
-- Sept. 2021 - Did this.
-- Did that.
-
-## My Project
-
 - Sept. 2021 - Istanbul, Turkey 
 ## My Project
 
@@ -708,11 +695,6 @@ My Text Entry with some **markdown** and [links](https://example.com)!
 
 ## My Project
 
-- Sept. 2021 - Did this.
-- Did that.
-
-## My Project
-
 - Sept. 2021 - Istanbul, Turkey 
 ## My Project
 
@@ -726,6 +708,19 @@ My Text Entry with some **markdown** and [links](https://example.com)!
 
 ## My Project
 
+- Sept. 2021 
+## My Project
+
+- Sept. 2015 to present - Did this.
+- Did that.
+
+## My Project
+
+- Sept. 2021 - Did this.
+- Did that.
+
+## My Project
+
 - Sept. 2021 - Did this.
 - Did that.
 
@@ -749,6 +744,11 @@ My Text Entry with some **markdown** and [links](https://example.com)!
 
 ## My Project
 
+- Sept. 2021 - Did this.
+- Did that.
+
+## My Project
+
 - Sept. 2021 - Istanbul, Turkey - Did this.
 - Did that.
 
diff --git a/tests/testdata/test_latex_to_pdf/classic_empty/None_CV.pdf b/tests/testdata/test_latex_to_pdf/classic_empty.pdf
similarity index 99%
rename from tests/testdata/test_latex_to_pdf/classic_empty/None_CV.pdf
rename to tests/testdata/test_latex_to_pdf/classic_empty.pdf
index 043e2c87..d83ae0b1 100644
Binary files a/tests/testdata/test_latex_to_pdf/classic_empty/None_CV.pdf and b/tests/testdata/test_latex_to_pdf/classic_empty.pdf differ
diff --git a/tests/testdata/test_latex_to_pdf/classic_filled/John_Doe_CV.pdf b/tests/testdata/test_latex_to_pdf/classic_filled.pdf
similarity index 97%
rename from tests/testdata/test_latex_to_pdf/classic_filled/John_Doe_CV.pdf
rename to tests/testdata/test_latex_to_pdf/classic_filled.pdf
index 7cbc4f51..faa5f034 100644
Binary files a/tests/testdata/test_latex_to_pdf/classic_filled/John_Doe_CV.pdf and b/tests/testdata/test_latex_to_pdf/classic_filled.pdf differ
diff --git a/tests/testdata/test_latex_to_pdf/moderncv_empty/None_CV.pdf b/tests/testdata/test_latex_to_pdf/moderncv_empty.pdf
similarity index 99%
rename from tests/testdata/test_latex_to_pdf/moderncv_empty/None_CV.pdf
rename to tests/testdata/test_latex_to_pdf/moderncv_empty.pdf
index 12a2b909..2e80a19e 100644
Binary files a/tests/testdata/test_latex_to_pdf/moderncv_empty/None_CV.pdf and b/tests/testdata/test_latex_to_pdf/moderncv_empty.pdf differ
diff --git a/tests/testdata/test_latex_to_pdf/moderncv_filled/John_Doe_CV.pdf b/tests/testdata/test_latex_to_pdf/moderncv_filled.pdf
similarity index 95%
rename from tests/testdata/test_latex_to_pdf/moderncv_filled/John_Doe_CV.pdf
rename to tests/testdata/test_latex_to_pdf/moderncv_filled.pdf
index 5e3f7f49..f9700654 100644
Binary files a/tests/testdata/test_latex_to_pdf/moderncv_filled/John_Doe_CV.pdf and b/tests/testdata/test_latex_to_pdf/moderncv_filled.pdf differ
diff --git a/tests/testdata/test_latex_to_pdf/sb2nov_empty/None_CV.pdf b/tests/testdata/test_latex_to_pdf/sb2nov_empty.pdf
similarity index 99%
rename from tests/testdata/test_latex_to_pdf/sb2nov_empty/None_CV.pdf
rename to tests/testdata/test_latex_to_pdf/sb2nov_empty.pdf
index 8773d603..d3103094 100644
Binary files a/tests/testdata/test_latex_to_pdf/sb2nov_empty/None_CV.pdf and b/tests/testdata/test_latex_to_pdf/sb2nov_empty.pdf differ
diff --git a/tests/testdata/test_latex_to_pdf/sb2nov_filled/John_Doe_CV.pdf b/tests/testdata/test_latex_to_pdf/sb2nov_filled.pdf
similarity index 93%
rename from tests/testdata/test_latex_to_pdf/sb2nov_filled/John_Doe_CV.pdf
rename to tests/testdata/test_latex_to_pdf/sb2nov_filled.pdf
index 1d58d4e8..7a433ad6 100644
Binary files a/tests/testdata/test_latex_to_pdf/sb2nov_filled/John_Doe_CV.pdf and b/tests/testdata/test_latex_to_pdf/sb2nov_filled.pdf differ
diff --git a/tests/testdata/test_markdown_to_html/classic_empty/None_CV_PASTETOGRAMMARLY.html b/tests/testdata/test_markdown_to_html/classic_empty.html
similarity index 100%
rename from tests/testdata/test_markdown_to_html/classic_empty/None_CV_PASTETOGRAMMARLY.html
rename to tests/testdata/test_markdown_to_html/classic_empty.html
diff --git a/tests/testdata/test_markdown_to_html/classic_filled/John_Doe_CV_PASTETOGRAMMARLY.html b/tests/testdata/test_markdown_to_html/classic_filled.html
similarity index 99%
rename from tests/testdata/test_markdown_to_html/classic_filled/John_Doe_CV_PASTETOGRAMMARLY.html
rename to tests/testdata/test_markdown_to_html/classic_filled.html
index 74372a9a..f4d39553 100644
--- a/tests/testdata/test_markdown_to_html/classic_filled/John_Doe_CV_PASTETOGRAMMARLY.html
+++ b/tests/testdata/test_markdown_to_html/classic_filled.html
@@ -47,6 +47,10 @@
 <h2>Some Company, Software Engineer</h2>
 <h2>Some Company, Software Engineer</h2>
 <ul>
+<li>Istanbul, Turkey </li>
+</ul>
+<h2>Some Company, Software Engineer</h2>
+<ul>
 <li>Sept. 2015 to present </li>
 </ul>
 <h2>Some Company, Software Engineer</h2>
@@ -64,10 +68,27 @@
 </ul>
 <h2>Some Company, Software Engineer</h2>
 <ul>
+<li>Sept. 2015 to present </li>
 <li>Istanbul, Turkey </li>
 </ul>
 <h2>Some Company, Software Engineer</h2>
 <ul>
+<li>Jan. 2024 </li>
+<li>Istanbul, Turkey </li>
+</ul>
+<h2>Some Company, Software Engineer</h2>
+<ul>
+<li>Sept. 2021 </li>
+<li>Istanbul, Turkey </li>
+</ul>
+<h2>Some Company, Software Engineer</h2>
+<ul>
+<li>Istanbul, Turkey </li>
+<li>Did this.</li>
+<li>Did that.</li>
+</ul>
+<h2>Some Company, Software Engineer</h2>
+<ul>
 <li>Sept. 2015 to present </li>
 </ul>
 <h2>Some Company, Software Engineer</h2>
@@ -86,11 +107,6 @@
 </ul>
 <h2>Some Company, Software Engineer</h2>
 <ul>
-<li>Sept. 2015 to present </li>
-<li>Istanbul, Turkey </li>
-</ul>
-<h2>Some Company, Software Engineer</h2>
-<ul>
 <li>Sept. 2021 </li>
 </ul>
 <h2>Some Company, Software Engineer</h2>
@@ -105,11 +121,6 @@
 </ul>
 <h2>Some Company, Software Engineer</h2>
 <ul>
-<li>Jan. 2024 </li>
-<li>Istanbul, Turkey </li>
-</ul>
-<h2>Some Company, Software Engineer</h2>
-<ul>
 <li>
 <p>Sept. 2021 </p>
 </li>
@@ -120,11 +131,36 @@
 </ul>
 <h2>Some Company, Software Engineer</h2>
 <ul>
+<li>Sept. 2015 to present </li>
+<li>Istanbul, Turkey </li>
+</ul>
+<h2>Some Company, Software Engineer</h2>
+<ul>
 <li>Sept. 2021 </li>
 <li>Istanbul, Turkey </li>
 </ul>
 <h2>Some Company, Software Engineer</h2>
 <ul>
+<li>Sept. 2015 to present </li>
+<li>Istanbul, Turkey </li>
+<li>Did this.</li>
+<li>Did that.</li>
+</ul>
+<h2>Some Company, Software Engineer</h2>
+<ul>
+<li>Sept. 2021 </li>
+<li>Istanbul, Turkey </li>
+</ul>
+<h2>Some Company, Software Engineer</h2>
+<ul>
+<li>Jan. 2024 </li>
+<li>Istanbul, Turkey </li>
+<li>Did this.</li>
+<li>Did that.</li>
+</ul>
+<h2>Some Company, Software Engineer</h2>
+<ul>
+<li>Sept. 2021 </li>
 <li>Istanbul, Turkey </li>
 <li>Did this.</li>
 <li>Did that.</li>
@@ -145,11 +181,6 @@
 </ul>
 <h2>Some Company, Software Engineer</h2>
 <ul>
-<li>Sept. 2015 to present </li>
-<li>Istanbul, Turkey </li>
-</ul>
-<h2>Some Company, Software Engineer</h2>
-<ul>
 <li>
 <p>Sept. 2021 </p>
 </li>
@@ -160,47 +191,6 @@
 </ul>
 <h2>Some Company, Software Engineer</h2>
 <ul>
-<li>Sept. 2021 </li>
-<li>Istanbul, Turkey </li>
-</ul>
-<h2>Some Company, Software Engineer</h2>
-<ul>
-<li>Sept. 2015 to present </li>
-<li>Istanbul, Turkey </li>
-<li>Did this.</li>
-<li>Did that.</li>
-</ul>
-<h2>Some Company, Software Engineer</h2>
-<ul>
-<li>
-<p>Sept. 2021 </p>
-</li>
-<li>
-<p>Did this.</p>
-</li>
-<li>Did that.</li>
-</ul>
-<h2>Some Company, Software Engineer</h2>
-<ul>
-<li>Sept. 2021 </li>
-<li>Istanbul, Turkey </li>
-</ul>
-<h2>Some Company, Software Engineer</h2>
-<ul>
-<li>Jan. 2024 </li>
-<li>Istanbul, Turkey </li>
-<li>Did this.</li>
-<li>Did that.</li>
-</ul>
-<h2>Some Company, Software Engineer</h2>
-<ul>
-<li>Sept. 2021 </li>
-<li>Istanbul, Turkey </li>
-<li>Did this.</li>
-<li>Did that.</li>
-</ul>
-<h2>Some Company, Software Engineer</h2>
-<ul>
 <li>
 <p>Sept. 2021 </p>
 </li>
@@ -237,6 +227,16 @@
 </ul>
 <h2>Some Company, Software Engineer</h2>
 <ul>
+<li>
+<p>Sept. 2021 </p>
+</li>
+<li>
+<p>Did this.</p>
+</li>
+<li>Did that.</li>
+</ul>
+<h2>Some Company, Software Engineer</h2>
+<ul>
 <li>Sept. 2021 </li>
 <li>Istanbul, Turkey </li>
 <li>Did this.</li>
@@ -246,6 +246,10 @@
 <h2>Boğaziçi University, Mechanical Engineering</h2>
 <h2>Boğaziçi University, Mechanical Engineering</h2>
 <ul>
+<li>Istanbul, Turkey </li>
+</ul>
+<h2>Boğaziçi University, Mechanical Engineering</h2>
+<ul>
 <li>Sept. 2015 to present </li>
 </ul>
 <h2>Boğaziçi University, Mechanical Engineering</h2>
@@ -261,11 +265,32 @@
 <li>Did this.</li>
 <li>Did that.</li>
 </ul>
+<h2>Boğaziçi University, BS in Mechanical Engineering</h2>
+<h2>Boğaziçi University, Mechanical Engineering</h2>
+<ul>
+<li>Sept. 2015 to present </li>
+<li>Istanbul, Turkey </li>
+</ul>
+<h2>Boğaziçi University, Mechanical Engineering</h2>
+<ul>
+<li>Jan. 2024 </li>
+<li>Istanbul, Turkey </li>
+</ul>
+<h2>Boğaziçi University, Mechanical Engineering</h2>
+<ul>
+<li>Sept. 2021 </li>
+<li>Istanbul, Turkey </li>
+</ul>
 <h2>Boğaziçi University, Mechanical Engineering</h2>
 <ul>
 <li>Istanbul, Turkey </li>
+<li>Did this.</li>
+<li>Did that.</li>
 </ul>
 <h2>Boğaziçi University, BS in Mechanical Engineering</h2>
+<ul>
+<li>Istanbul, Turkey </li>
+</ul>
 <h2>Boğaziçi University, Mechanical Engineering</h2>
 <ul>
 <li>Sept. 2015 to present </li>
@@ -284,11 +309,6 @@
 </li>
 <li>Did that.</li>
 </ul>
-<h2>Boğaziçi University, Mechanical Engineering</h2>
-<ul>
-<li>Sept. 2015 to present </li>
-<li>Istanbul, Turkey </li>
-</ul>
 <h2>Boğaziçi University, BS in Mechanical Engineering</h2>
 <ul>
 <li>Sept. 2015 to present </li>
@@ -307,11 +327,6 @@
 </li>
 <li>Did that.</li>
 </ul>
-<h2>Boğaziçi University, Mechanical Engineering</h2>
-<ul>
-<li>Jan. 2024 </li>
-<li>Istanbul, Turkey </li>
-</ul>
 <h2>Boğaziçi University, BS in Mechanical Engineering</h2>
 <ul>
 <li>Jan. 2024 </li>
@@ -326,29 +341,71 @@
 </li>
 <li>Did that.</li>
 </ul>
-<h2>Boğaziçi University, Mechanical Engineering</h2>
-<ul>
-<li>Sept. 2021 </li>
-<li>Istanbul, Turkey </li>
-</ul>
 <h2>Boğaziçi University, BS in Mechanical Engineering</h2>
 <ul>
 <li>Sept. 2021 </li>
 </ul>
-<h2>Boğaziçi University, Mechanical Engineering</h2>
-<ul>
-<li>Istanbul, Turkey </li>
-<li>Did this.</li>
-<li>Did that.</li>
-</ul>
 <h2>Boğaziçi University, BS in Mechanical Engineering</h2>
 <ul>
 <li>Did this.</li>
 <li>Did that.</li>
 </ul>
+<h2>Boğaziçi University, Mechanical Engineering</h2>
+<ul>
+<li>Sept. 2015 to present </li>
+<li>Istanbul, Turkey </li>
+</ul>
+<h2>Boğaziçi University, Mechanical Engineering</h2>
+<ul>
+<li>Sept. 2021 </li>
+<li>Istanbul, Turkey </li>
+</ul>
+<h2>Boğaziçi University, Mechanical Engineering</h2>
+<ul>
+<li>Sept. 2015 to present </li>
+<li>Istanbul, Turkey </li>
+<li>Did this.</li>
+<li>Did that.</li>
+</ul>
+<h2>Boğaziçi University, BS in Mechanical Engineering</h2>
+<ul>
+<li>Sept. 2015 to present </li>
+<li>Istanbul, Turkey </li>
+</ul>
+<h2>Boğaziçi University, Mechanical Engineering</h2>
+<ul>
+<li>Sept. 2021 </li>
+<li>Istanbul, Turkey </li>
+</ul>
+<h2>Boğaziçi University, Mechanical Engineering</h2>
+<ul>
+<li>Jan. 2024 </li>
+<li>Istanbul, Turkey </li>
+<li>Did this.</li>
+<li>Did that.</li>
+</ul>
+<h2>Boğaziçi University, BS in Mechanical Engineering</h2>
+<ul>
+<li>Jan. 2024 </li>
+<li>Istanbul, Turkey </li>
+</ul>
+<h2>Boğaziçi University, Mechanical Engineering</h2>
+<ul>
+<li>Sept. 2021 </li>
+<li>Istanbul, Turkey </li>
+<li>Did this.</li>
+<li>Did that.</li>
+</ul>
+<h2>Boğaziçi University, BS in Mechanical Engineering</h2>
+<ul>
+<li>Sept. 2021 </li>
+<li>Istanbul, Turkey </li>
+</ul>
 <h2>Boğaziçi University, BS in Mechanical Engineering</h2>
 <ul>
 <li>Istanbul, Turkey </li>
+<li>Did this.</li>
+<li>Did that.</li>
 </ul>
 <h2>Boğaziçi University, Mechanical Engineering</h2>
 <ul>
@@ -364,11 +421,6 @@
 </li>
 <li>Did that.</li>
 </ul>
-<h2>Boğaziçi University, Mechanical Engineering</h2>
-<ul>
-<li>Sept. 2015 to present </li>
-<li>Istanbul, Turkey </li>
-</ul>
 <h2>Boğaziçi University, BS in Mechanical Engineering</h2>
 <ul>
 <li>Sept. 2015 to present </li>
@@ -383,22 +435,10 @@
 </li>
 <li>Did that.</li>
 </ul>
-<h2>Boğaziçi University, Mechanical Engineering</h2>
-<ul>
-<li>Sept. 2021 </li>
-<li>Istanbul, Turkey </li>
-</ul>
 <h2>Boğaziçi University, BS in Mechanical Engineering</h2>
 <ul>
 <li>Sept. 2021 </li>
 </ul>
-<h2>Boğaziçi University, Mechanical Engineering</h2>
-<ul>
-<li>Sept. 2015 to present </li>
-<li>Istanbul, Turkey </li>
-<li>Did this.</li>
-<li>Did that.</li>
-</ul>
 <h2>Boğaziçi University, BS in Mechanical Engineering</h2>
 <ul>
 <li>
@@ -409,11 +449,6 @@
 </li>
 <li>Did that.</li>
 </ul>
-<h2>Boğaziçi University, BS in Mechanical Engineering</h2>
-<ul>
-<li>Sept. 2015 to present </li>
-<li>Istanbul, Turkey </li>
-</ul>
 <h2>Boğaziçi University, Mechanical Engineering</h2>
 <ul>
 <li>
@@ -424,22 +459,10 @@
 </li>
 <li>Did that.</li>
 </ul>
-<h2>Boğaziçi University, Mechanical Engineering</h2>
-<ul>
-<li>Sept. 2021 </li>
-<li>Istanbul, Turkey </li>
-</ul>
 <h2>Boğaziçi University, BS in Mechanical Engineering</h2>
 <ul>
 <li>Sept. 2021 </li>
 </ul>
-<h2>Boğaziçi University, Mechanical Engineering</h2>
-<ul>
-<li>Jan. 2024 </li>
-<li>Istanbul, Turkey </li>
-<li>Did this.</li>
-<li>Did that.</li>
-</ul>
 <h2>Boğaziçi University, BS in Mechanical Engineering</h2>
 <ul>
 <li>
@@ -452,39 +475,6 @@
 </ul>
 <h2>Boğaziçi University, BS in Mechanical Engineering</h2>
 <ul>
-<li>Jan. 2024 </li>
-<li>Istanbul, Turkey </li>
-</ul>
-<h2>Boğaziçi University, Mechanical Engineering</h2>
-<ul>
-<li>Sept. 2021 </li>
-<li>Istanbul, Turkey </li>
-<li>Did this.</li>
-<li>Did that.</li>
-</ul>
-<h2>Boğaziçi University, BS in Mechanical Engineering</h2>
-<ul>
-<li>
-<p>Sept. 2021 </p>
-</li>
-<li>
-<p>Did this.</p>
-</li>
-<li>Did that.</li>
-</ul>
-<h2>Boğaziçi University, BS in Mechanical Engineering</h2>
-<ul>
-<li>Sept. 2021 </li>
-<li>Istanbul, Turkey </li>
-</ul>
-<h2>Boğaziçi University, BS in Mechanical Engineering</h2>
-<ul>
-<li>Istanbul, Turkey </li>
-<li>Did this.</li>
-<li>Did that.</li>
-</ul>
-<h2>Boğaziçi University, Mechanical Engineering</h2>
-<ul>
 <li>
 <p>Sept. 2021 </p>
 </li>
@@ -498,10 +488,6 @@
 <li>Sept. 2021 </li>
 <li>Istanbul, Turkey </li>
 </ul>
-<h2>Boğaziçi University, BS in Mechanical Engineering</h2>
-<ul>
-<li>Sept. 2021 </li>
-</ul>
 <h2>Boğaziçi University, Mechanical Engineering</h2>
 <ul>
 <li>Sept. 2015 to present </li>
@@ -511,6 +497,70 @@
 </ul>
 <h2>Boğaziçi University, BS in Mechanical Engineering</h2>
 <ul>
+<li>Sept. 2015 to present </li>
+<li>Istanbul, Turkey </li>
+</ul>
+<h2>Boğaziçi University, Mechanical Engineering</h2>
+<ul>
+<li>Sept. 2021 </li>
+<li>Istanbul, Turkey </li>
+<li>Did this.</li>
+<li>Did that.</li>
+</ul>
+<h2>Boğaziçi University, BS in Mechanical Engineering</h2>
+<ul>
+<li>Sept. 2021 </li>
+<li>Istanbul, Turkey </li>
+</ul>
+<h2>Boğaziçi University, BS in Mechanical Engineering</h2>
+<ul>
+<li>Sept. 2015 to present </li>
+<li>Istanbul, Turkey </li>
+<li>Did this.</li>
+<li>Did that.</li>
+</ul>
+<h2>Boğaziçi University, Mechanical Engineering</h2>
+<ul>
+<li>Sept. 2021 </li>
+<li>Istanbul, Turkey </li>
+<li>Did this.</li>
+<li>Did that.</li>
+</ul>
+<h2>Boğaziçi University, BS in Mechanical Engineering</h2>
+<ul>
+<li>Sept. 2021 </li>
+<li>Istanbul, Turkey </li>
+</ul>
+<h2>Boğaziçi University, BS in Mechanical Engineering</h2>
+<ul>
+<li>Jan. 2024 </li>
+<li>Istanbul, Turkey </li>
+<li>Did this.</li>
+<li>Did that.</li>
+</ul>
+<h2>Boğaziçi University, BS in Mechanical Engineering</h2>
+<ul>
+<li>Sept. 2021 </li>
+<li>Istanbul, Turkey </li>
+<li>Did this.</li>
+<li>Did that.</li>
+</ul>
+<h2>Boğaziçi University, Mechanical Engineering</h2>
+<ul>
+<li>
+<p>Sept. 2021 </p>
+</li>
+<li>
+<p>Did this.</p>
+</li>
+<li>Did that.</li>
+</ul>
+<h2>Boğaziçi University, BS in Mechanical Engineering</h2>
+<ul>
+<li>Sept. 2021 </li>
+</ul>
+<h2>Boğaziçi University, BS in Mechanical Engineering</h2>
+<ul>
 <li>
 <p>Sept. 2015 to present </p>
 </li>
@@ -521,14 +571,12 @@
 </ul>
 <h2>Boğaziçi University, BS in Mechanical Engineering</h2>
 <ul>
-<li>Sept. 2015 to present </li>
-<li>Istanbul, Turkey </li>
-</ul>
-<h2>Boğaziçi University, Mechanical Engineering</h2>
-<ul>
-<li>Sept. 2021 </li>
-<li>Istanbul, Turkey </li>
-<li>Did this.</li>
+<li>
+<p>Sept. 2021 </p>
+</li>
+<li>
+<p>Did this.</p>
+</li>
 <li>Did that.</li>
 </ul>
 <h2>Boğaziçi University, BS in Mechanical Engineering</h2>
@@ -541,18 +589,6 @@
 </li>
 <li>Did that.</li>
 </ul>
-<h2>Boğaziçi University, BS in Mechanical Engineering</h2>
-<ul>
-<li>Sept. 2021 </li>
-<li>Istanbul, Turkey </li>
-</ul>
-<h2>Boğaziçi University, BS in Mechanical Engineering</h2>
-<ul>
-<li>Sept. 2015 to present </li>
-<li>Istanbul, Turkey </li>
-<li>Did this.</li>
-<li>Did that.</li>
-</ul>
 <h2>Boğaziçi University, Mechanical Engineering</h2>
 <ul>
 <li>Sept. 2021 </li>
@@ -562,52 +598,6 @@
 </ul>
 <h2>Boğaziçi University, BS in Mechanical Engineering</h2>
 <ul>
-<li>
-<p>Sept. 2021 </p>
-</li>
-<li>
-<p>Did this.</p>
-</li>
-<li>Did that.</li>
-</ul>
-<h2>Boğaziçi University, BS in Mechanical Engineering</h2>
-<ul>
-<li>Sept. 2021 </li>
-<li>Istanbul, Turkey </li>
-</ul>
-<h2>Boğaziçi University, BS in Mechanical Engineering</h2>
-<ul>
-<li>Jan. 2024 </li>
-<li>Istanbul, Turkey </li>
-<li>Did this.</li>
-<li>Did that.</li>
-</ul>
-<h2>Boğaziçi University, BS in Mechanical Engineering</h2>
-<ul>
-<li>Sept. 2021 </li>
-<li>Istanbul, Turkey </li>
-<li>Did this.</li>
-<li>Did that.</li>
-</ul>
-<h2>Boğaziçi University, Mechanical Engineering</h2>
-<ul>
-<li>Sept. 2021 </li>
-<li>Istanbul, Turkey </li>
-<li>Did this.</li>
-<li>Did that.</li>
-</ul>
-<h2>Boğaziçi University, BS in Mechanical Engineering</h2>
-<ul>
-<li>
-<p>Sept. 2021 </p>
-</li>
-<li>
-<p>Did this.</p>
-</li>
-<li>Did that.</li>
-</ul>
-<h2>Boğaziçi University, BS in Mechanical Engineering</h2>
-<ul>
 <li>Sept. 2021 </li>
 <li>Istanbul, Turkey </li>
 </ul>
@@ -634,6 +624,16 @@
 </ul>
 <h2>Boğaziçi University, BS in Mechanical Engineering</h2>
 <ul>
+<li>
+<p>Sept. 2021 </p>
+</li>
+<li>
+<p>Did this.</p>
+</li>
+<li>Did that.</li>
+</ul>
+<h2>Boğaziçi University, BS in Mechanical Engineering</h2>
+<ul>
 <li>Sept. 2021 </li>
 <li>Istanbul, Turkey </li>
 <li>Did this.</li>
@@ -643,6 +643,10 @@
 <h2>My Project</h2>
 <h2>My Project</h2>
 <ul>
+<li>Istanbul, Turkey </li>
+</ul>
+<h2>My Project</h2>
+<ul>
 <li>Sept. 2015 to present </li>
 </ul>
 <h2>My Project</h2>
@@ -660,7 +664,20 @@
 </ul>
 <h2>My Project</h2>
 <ul>
-<li>Istanbul, Turkey </li>
+<li>Sept. 2015 to present - Istanbul, Turkey </li>
+</ul>
+<h2>My Project</h2>
+<ul>
+<li>Jan. 2024 - Istanbul, Turkey </li>
+</ul>
+<h2>My Project</h2>
+<ul>
+<li>Sept. 2021 - Istanbul, Turkey </li>
+</ul>
+<h2>My Project</h2>
+<ul>
+<li>Istanbul, Turkey - Did this.</li>
+<li>Did that.</li>
 </ul>
 <h2>My Project</h2>
 <ul>
@@ -677,10 +694,6 @@
 </ul>
 <h2>My Project</h2>
 <ul>
-<li>Sept. 2015 to present - Istanbul, Turkey </li>
-</ul>
-<h2>My Project</h2>
-<ul>
 <li>Sept. 2021 </li>
 </ul>
 <h2>My Project</h2>
@@ -690,42 +703,15 @@
 </ul>
 <h2>My Project</h2>
 <ul>
-<li>Jan. 2024 - Istanbul, Turkey </li>
-</ul>
-<h2>My Project</h2>
-<ul>
 <li>Sept. 2021 - Did this.</li>
 <li>Did that.</li>
 </ul>
 <h2>My Project</h2>
 <ul>
-<li>Sept. 2021 - Istanbul, Turkey </li>
-</ul>
-<h2>My Project</h2>
-<ul>
-<li>Istanbul, Turkey - Did this.</li>
-<li>Did that.</li>
-</ul>
-<h2>My Project</h2>
-<ul>
-<li>Sept. 2021 </li>
-</ul>
-<h2>My Project</h2>
-<ul>
-<li>Sept. 2015 to present - Did this.</li>
-<li>Did that.</li>
-</ul>
-<h2>My Project</h2>
-<ul>
 <li>Sept. 2015 to present - Istanbul, Turkey </li>
 </ul>
 <h2>My Project</h2>
 <ul>
-<li>Sept. 2021 - Did this.</li>
-<li>Did that.</li>
-</ul>
-<h2>My Project</h2>
-<ul>
 <li>Sept. 2021 - Istanbul, Turkey </li>
 </ul>
 <h2>My Project</h2>
@@ -735,11 +721,6 @@
 </ul>
 <h2>My Project</h2>
 <ul>
-<li>Sept. 2021 - Did this.</li>
-<li>Did that.</li>
-</ul>
-<h2>My Project</h2>
-<ul>
 <li>Sept. 2021 - Istanbul, Turkey </li>
 </ul>
 <h2>My Project</h2>
@@ -754,6 +735,20 @@
 </ul>
 <h2>My Project</h2>
 <ul>
+<li>Sept. 2021 </li>
+</ul>
+<h2>My Project</h2>
+<ul>
+<li>Sept. 2015 to present - Did this.</li>
+<li>Did that.</li>
+</ul>
+<h2>My Project</h2>
+<ul>
+<li>Sept. 2021 - Did this.</li>
+<li>Did that.</li>
+</ul>
+<h2>My Project</h2>
+<ul>
 <li>Sept. 2021 - Did this.</li>
 <li>Did that.</li>
 </ul>
@@ -778,6 +773,11 @@
 </ul>
 <h2>My Project</h2>
 <ul>
+<li>Sept. 2021 - Did this.</li>
+<li>Did that.</li>
+</ul>
+<h2>My Project</h2>
+<ul>
 <li>Sept. 2021 - Istanbul, Turkey - Did this.</li>
 <li>Did that.</li>
 </ul>
diff --git a/tests/testdata/test_markdown_to_html/moderncv_empty/None_CV_PASTETOGRAMMARLY.html b/tests/testdata/test_markdown_to_html/moderncv_empty.html
similarity index 100%
rename from tests/testdata/test_markdown_to_html/moderncv_empty/None_CV_PASTETOGRAMMARLY.html
rename to tests/testdata/test_markdown_to_html/moderncv_empty.html
diff --git a/tests/testdata/test_markdown_to_html/moderncv_filled/John_Doe_CV_PASTETOGRAMMARLY.html b/tests/testdata/test_markdown_to_html/moderncv_filled.html
similarity index 99%
rename from tests/testdata/test_markdown_to_html/moderncv_filled/John_Doe_CV_PASTETOGRAMMARLY.html
rename to tests/testdata/test_markdown_to_html/moderncv_filled.html
index 74372a9a..f4d39553 100644
--- a/tests/testdata/test_markdown_to_html/moderncv_filled/John_Doe_CV_PASTETOGRAMMARLY.html
+++ b/tests/testdata/test_markdown_to_html/moderncv_filled.html
@@ -47,6 +47,10 @@
 <h2>Some Company, Software Engineer</h2>
 <h2>Some Company, Software Engineer</h2>
 <ul>
+<li>Istanbul, Turkey </li>
+</ul>
+<h2>Some Company, Software Engineer</h2>
+<ul>
 <li>Sept. 2015 to present </li>
 </ul>
 <h2>Some Company, Software Engineer</h2>
@@ -64,10 +68,27 @@
 </ul>
 <h2>Some Company, Software Engineer</h2>
 <ul>
+<li>Sept. 2015 to present </li>
 <li>Istanbul, Turkey </li>
 </ul>
 <h2>Some Company, Software Engineer</h2>
 <ul>
+<li>Jan. 2024 </li>
+<li>Istanbul, Turkey </li>
+</ul>
+<h2>Some Company, Software Engineer</h2>
+<ul>
+<li>Sept. 2021 </li>
+<li>Istanbul, Turkey </li>
+</ul>
+<h2>Some Company, Software Engineer</h2>
+<ul>
+<li>Istanbul, Turkey </li>
+<li>Did this.</li>
+<li>Did that.</li>
+</ul>
+<h2>Some Company, Software Engineer</h2>
+<ul>
 <li>Sept. 2015 to present </li>
 </ul>
 <h2>Some Company, Software Engineer</h2>
@@ -86,11 +107,6 @@
 </ul>
 <h2>Some Company, Software Engineer</h2>
 <ul>
-<li>Sept. 2015 to present </li>
-<li>Istanbul, Turkey </li>
-</ul>
-<h2>Some Company, Software Engineer</h2>
-<ul>
 <li>Sept. 2021 </li>
 </ul>
 <h2>Some Company, Software Engineer</h2>
@@ -105,11 +121,6 @@
 </ul>
 <h2>Some Company, Software Engineer</h2>
 <ul>
-<li>Jan. 2024 </li>
-<li>Istanbul, Turkey </li>
-</ul>
-<h2>Some Company, Software Engineer</h2>
-<ul>
 <li>
 <p>Sept. 2021 </p>
 </li>
@@ -120,11 +131,36 @@
 </ul>
 <h2>Some Company, Software Engineer</h2>
 <ul>
+<li>Sept. 2015 to present </li>
+<li>Istanbul, Turkey </li>
+</ul>
+<h2>Some Company, Software Engineer</h2>
+<ul>
 <li>Sept. 2021 </li>
 <li>Istanbul, Turkey </li>
 </ul>
 <h2>Some Company, Software Engineer</h2>
 <ul>
+<li>Sept. 2015 to present </li>
+<li>Istanbul, Turkey </li>
+<li>Did this.</li>
+<li>Did that.</li>
+</ul>
+<h2>Some Company, Software Engineer</h2>
+<ul>
+<li>Sept. 2021 </li>
+<li>Istanbul, Turkey </li>
+</ul>
+<h2>Some Company, Software Engineer</h2>
+<ul>
+<li>Jan. 2024 </li>
+<li>Istanbul, Turkey </li>
+<li>Did this.</li>
+<li>Did that.</li>
+</ul>
+<h2>Some Company, Software Engineer</h2>
+<ul>
+<li>Sept. 2021 </li>
 <li>Istanbul, Turkey </li>
 <li>Did this.</li>
 <li>Did that.</li>
@@ -145,11 +181,6 @@
 </ul>
 <h2>Some Company, Software Engineer</h2>
 <ul>
-<li>Sept. 2015 to present </li>
-<li>Istanbul, Turkey </li>
-</ul>
-<h2>Some Company, Software Engineer</h2>
-<ul>
 <li>
 <p>Sept. 2021 </p>
 </li>
@@ -160,47 +191,6 @@
 </ul>
 <h2>Some Company, Software Engineer</h2>
 <ul>
-<li>Sept. 2021 </li>
-<li>Istanbul, Turkey </li>
-</ul>
-<h2>Some Company, Software Engineer</h2>
-<ul>
-<li>Sept. 2015 to present </li>
-<li>Istanbul, Turkey </li>
-<li>Did this.</li>
-<li>Did that.</li>
-</ul>
-<h2>Some Company, Software Engineer</h2>
-<ul>
-<li>
-<p>Sept. 2021 </p>
-</li>
-<li>
-<p>Did this.</p>
-</li>
-<li>Did that.</li>
-</ul>
-<h2>Some Company, Software Engineer</h2>
-<ul>
-<li>Sept. 2021 </li>
-<li>Istanbul, Turkey </li>
-</ul>
-<h2>Some Company, Software Engineer</h2>
-<ul>
-<li>Jan. 2024 </li>
-<li>Istanbul, Turkey </li>
-<li>Did this.</li>
-<li>Did that.</li>
-</ul>
-<h2>Some Company, Software Engineer</h2>
-<ul>
-<li>Sept. 2021 </li>
-<li>Istanbul, Turkey </li>
-<li>Did this.</li>
-<li>Did that.</li>
-</ul>
-<h2>Some Company, Software Engineer</h2>
-<ul>
 <li>
 <p>Sept. 2021 </p>
 </li>
@@ -237,6 +227,16 @@
 </ul>
 <h2>Some Company, Software Engineer</h2>
 <ul>
+<li>
+<p>Sept. 2021 </p>
+</li>
+<li>
+<p>Did this.</p>
+</li>
+<li>Did that.</li>
+</ul>
+<h2>Some Company, Software Engineer</h2>
+<ul>
 <li>Sept. 2021 </li>
 <li>Istanbul, Turkey </li>
 <li>Did this.</li>
@@ -246,6 +246,10 @@
 <h2>Boğaziçi University, Mechanical Engineering</h2>
 <h2>Boğaziçi University, Mechanical Engineering</h2>
 <ul>
+<li>Istanbul, Turkey </li>
+</ul>
+<h2>Boğaziçi University, Mechanical Engineering</h2>
+<ul>
 <li>Sept. 2015 to present </li>
 </ul>
 <h2>Boğaziçi University, Mechanical Engineering</h2>
@@ -261,11 +265,32 @@
 <li>Did this.</li>
 <li>Did that.</li>
 </ul>
+<h2>Boğaziçi University, BS in Mechanical Engineering</h2>
+<h2>Boğaziçi University, Mechanical Engineering</h2>
+<ul>
+<li>Sept. 2015 to present </li>
+<li>Istanbul, Turkey </li>
+</ul>
+<h2>Boğaziçi University, Mechanical Engineering</h2>
+<ul>
+<li>Jan. 2024 </li>
+<li>Istanbul, Turkey </li>
+</ul>
+<h2>Boğaziçi University, Mechanical Engineering</h2>
+<ul>
+<li>Sept. 2021 </li>
+<li>Istanbul, Turkey </li>
+</ul>
 <h2>Boğaziçi University, Mechanical Engineering</h2>
 <ul>
 <li>Istanbul, Turkey </li>
+<li>Did this.</li>
+<li>Did that.</li>
 </ul>
 <h2>Boğaziçi University, BS in Mechanical Engineering</h2>
+<ul>
+<li>Istanbul, Turkey </li>
+</ul>
 <h2>Boğaziçi University, Mechanical Engineering</h2>
 <ul>
 <li>Sept. 2015 to present </li>
@@ -284,11 +309,6 @@
 </li>
 <li>Did that.</li>
 </ul>
-<h2>Boğaziçi University, Mechanical Engineering</h2>
-<ul>
-<li>Sept. 2015 to present </li>
-<li>Istanbul, Turkey </li>
-</ul>
 <h2>Boğaziçi University, BS in Mechanical Engineering</h2>
 <ul>
 <li>Sept. 2015 to present </li>
@@ -307,11 +327,6 @@
 </li>
 <li>Did that.</li>
 </ul>
-<h2>Boğaziçi University, Mechanical Engineering</h2>
-<ul>
-<li>Jan. 2024 </li>
-<li>Istanbul, Turkey </li>
-</ul>
 <h2>Boğaziçi University, BS in Mechanical Engineering</h2>
 <ul>
 <li>Jan. 2024 </li>
@@ -326,29 +341,71 @@
 </li>
 <li>Did that.</li>
 </ul>
-<h2>Boğaziçi University, Mechanical Engineering</h2>
-<ul>
-<li>Sept. 2021 </li>
-<li>Istanbul, Turkey </li>
-</ul>
 <h2>Boğaziçi University, BS in Mechanical Engineering</h2>
 <ul>
 <li>Sept. 2021 </li>
 </ul>
-<h2>Boğaziçi University, Mechanical Engineering</h2>
-<ul>
-<li>Istanbul, Turkey </li>
-<li>Did this.</li>
-<li>Did that.</li>
-</ul>
 <h2>Boğaziçi University, BS in Mechanical Engineering</h2>
 <ul>
 <li>Did this.</li>
 <li>Did that.</li>
 </ul>
+<h2>Boğaziçi University, Mechanical Engineering</h2>
+<ul>
+<li>Sept. 2015 to present </li>
+<li>Istanbul, Turkey </li>
+</ul>
+<h2>Boğaziçi University, Mechanical Engineering</h2>
+<ul>
+<li>Sept. 2021 </li>
+<li>Istanbul, Turkey </li>
+</ul>
+<h2>Boğaziçi University, Mechanical Engineering</h2>
+<ul>
+<li>Sept. 2015 to present </li>
+<li>Istanbul, Turkey </li>
+<li>Did this.</li>
+<li>Did that.</li>
+</ul>
+<h2>Boğaziçi University, BS in Mechanical Engineering</h2>
+<ul>
+<li>Sept. 2015 to present </li>
+<li>Istanbul, Turkey </li>
+</ul>
+<h2>Boğaziçi University, Mechanical Engineering</h2>
+<ul>
+<li>Sept. 2021 </li>
+<li>Istanbul, Turkey </li>
+</ul>
+<h2>Boğaziçi University, Mechanical Engineering</h2>
+<ul>
+<li>Jan. 2024 </li>
+<li>Istanbul, Turkey </li>
+<li>Did this.</li>
+<li>Did that.</li>
+</ul>
+<h2>Boğaziçi University, BS in Mechanical Engineering</h2>
+<ul>
+<li>Jan. 2024 </li>
+<li>Istanbul, Turkey </li>
+</ul>
+<h2>Boğaziçi University, Mechanical Engineering</h2>
+<ul>
+<li>Sept. 2021 </li>
+<li>Istanbul, Turkey </li>
+<li>Did this.</li>
+<li>Did that.</li>
+</ul>
+<h2>Boğaziçi University, BS in Mechanical Engineering</h2>
+<ul>
+<li>Sept. 2021 </li>
+<li>Istanbul, Turkey </li>
+</ul>
 <h2>Boğaziçi University, BS in Mechanical Engineering</h2>
 <ul>
 <li>Istanbul, Turkey </li>
+<li>Did this.</li>
+<li>Did that.</li>
 </ul>
 <h2>Boğaziçi University, Mechanical Engineering</h2>
 <ul>
@@ -364,11 +421,6 @@
 </li>
 <li>Did that.</li>
 </ul>
-<h2>Boğaziçi University, Mechanical Engineering</h2>
-<ul>
-<li>Sept. 2015 to present </li>
-<li>Istanbul, Turkey </li>
-</ul>
 <h2>Boğaziçi University, BS in Mechanical Engineering</h2>
 <ul>
 <li>Sept. 2015 to present </li>
@@ -383,22 +435,10 @@
 </li>
 <li>Did that.</li>
 </ul>
-<h2>Boğaziçi University, Mechanical Engineering</h2>
-<ul>
-<li>Sept. 2021 </li>
-<li>Istanbul, Turkey </li>
-</ul>
 <h2>Boğaziçi University, BS in Mechanical Engineering</h2>
 <ul>
 <li>Sept. 2021 </li>
 </ul>
-<h2>Boğaziçi University, Mechanical Engineering</h2>
-<ul>
-<li>Sept. 2015 to present </li>
-<li>Istanbul, Turkey </li>
-<li>Did this.</li>
-<li>Did that.</li>
-</ul>
 <h2>Boğaziçi University, BS in Mechanical Engineering</h2>
 <ul>
 <li>
@@ -409,11 +449,6 @@
 </li>
 <li>Did that.</li>
 </ul>
-<h2>Boğaziçi University, BS in Mechanical Engineering</h2>
-<ul>
-<li>Sept. 2015 to present </li>
-<li>Istanbul, Turkey </li>
-</ul>
 <h2>Boğaziçi University, Mechanical Engineering</h2>
 <ul>
 <li>
@@ -424,22 +459,10 @@
 </li>
 <li>Did that.</li>
 </ul>
-<h2>Boğaziçi University, Mechanical Engineering</h2>
-<ul>
-<li>Sept. 2021 </li>
-<li>Istanbul, Turkey </li>
-</ul>
 <h2>Boğaziçi University, BS in Mechanical Engineering</h2>
 <ul>
 <li>Sept. 2021 </li>
 </ul>
-<h2>Boğaziçi University, Mechanical Engineering</h2>
-<ul>
-<li>Jan. 2024 </li>
-<li>Istanbul, Turkey </li>
-<li>Did this.</li>
-<li>Did that.</li>
-</ul>
 <h2>Boğaziçi University, BS in Mechanical Engineering</h2>
 <ul>
 <li>
@@ -452,39 +475,6 @@
 </ul>
 <h2>Boğaziçi University, BS in Mechanical Engineering</h2>
 <ul>
-<li>Jan. 2024 </li>
-<li>Istanbul, Turkey </li>
-</ul>
-<h2>Boğaziçi University, Mechanical Engineering</h2>
-<ul>
-<li>Sept. 2021 </li>
-<li>Istanbul, Turkey </li>
-<li>Did this.</li>
-<li>Did that.</li>
-</ul>
-<h2>Boğaziçi University, BS in Mechanical Engineering</h2>
-<ul>
-<li>
-<p>Sept. 2021 </p>
-</li>
-<li>
-<p>Did this.</p>
-</li>
-<li>Did that.</li>
-</ul>
-<h2>Boğaziçi University, BS in Mechanical Engineering</h2>
-<ul>
-<li>Sept. 2021 </li>
-<li>Istanbul, Turkey </li>
-</ul>
-<h2>Boğaziçi University, BS in Mechanical Engineering</h2>
-<ul>
-<li>Istanbul, Turkey </li>
-<li>Did this.</li>
-<li>Did that.</li>
-</ul>
-<h2>Boğaziçi University, Mechanical Engineering</h2>
-<ul>
 <li>
 <p>Sept. 2021 </p>
 </li>
@@ -498,10 +488,6 @@
 <li>Sept. 2021 </li>
 <li>Istanbul, Turkey </li>
 </ul>
-<h2>Boğaziçi University, BS in Mechanical Engineering</h2>
-<ul>
-<li>Sept. 2021 </li>
-</ul>
 <h2>Boğaziçi University, Mechanical Engineering</h2>
 <ul>
 <li>Sept. 2015 to present </li>
@@ -511,6 +497,70 @@
 </ul>
 <h2>Boğaziçi University, BS in Mechanical Engineering</h2>
 <ul>
+<li>Sept. 2015 to present </li>
+<li>Istanbul, Turkey </li>
+</ul>
+<h2>Boğaziçi University, Mechanical Engineering</h2>
+<ul>
+<li>Sept. 2021 </li>
+<li>Istanbul, Turkey </li>
+<li>Did this.</li>
+<li>Did that.</li>
+</ul>
+<h2>Boğaziçi University, BS in Mechanical Engineering</h2>
+<ul>
+<li>Sept. 2021 </li>
+<li>Istanbul, Turkey </li>
+</ul>
+<h2>Boğaziçi University, BS in Mechanical Engineering</h2>
+<ul>
+<li>Sept. 2015 to present </li>
+<li>Istanbul, Turkey </li>
+<li>Did this.</li>
+<li>Did that.</li>
+</ul>
+<h2>Boğaziçi University, Mechanical Engineering</h2>
+<ul>
+<li>Sept. 2021 </li>
+<li>Istanbul, Turkey </li>
+<li>Did this.</li>
+<li>Did that.</li>
+</ul>
+<h2>Boğaziçi University, BS in Mechanical Engineering</h2>
+<ul>
+<li>Sept. 2021 </li>
+<li>Istanbul, Turkey </li>
+</ul>
+<h2>Boğaziçi University, BS in Mechanical Engineering</h2>
+<ul>
+<li>Jan. 2024 </li>
+<li>Istanbul, Turkey </li>
+<li>Did this.</li>
+<li>Did that.</li>
+</ul>
+<h2>Boğaziçi University, BS in Mechanical Engineering</h2>
+<ul>
+<li>Sept. 2021 </li>
+<li>Istanbul, Turkey </li>
+<li>Did this.</li>
+<li>Did that.</li>
+</ul>
+<h2>Boğaziçi University, Mechanical Engineering</h2>
+<ul>
+<li>
+<p>Sept. 2021 </p>
+</li>
+<li>
+<p>Did this.</p>
+</li>
+<li>Did that.</li>
+</ul>
+<h2>Boğaziçi University, BS in Mechanical Engineering</h2>
+<ul>
+<li>Sept. 2021 </li>
+</ul>
+<h2>Boğaziçi University, BS in Mechanical Engineering</h2>
+<ul>
 <li>
 <p>Sept. 2015 to present </p>
 </li>
@@ -521,14 +571,12 @@
 </ul>
 <h2>Boğaziçi University, BS in Mechanical Engineering</h2>
 <ul>
-<li>Sept. 2015 to present </li>
-<li>Istanbul, Turkey </li>
-</ul>
-<h2>Boğaziçi University, Mechanical Engineering</h2>
-<ul>
-<li>Sept. 2021 </li>
-<li>Istanbul, Turkey </li>
-<li>Did this.</li>
+<li>
+<p>Sept. 2021 </p>
+</li>
+<li>
+<p>Did this.</p>
+</li>
 <li>Did that.</li>
 </ul>
 <h2>Boğaziçi University, BS in Mechanical Engineering</h2>
@@ -541,18 +589,6 @@
 </li>
 <li>Did that.</li>
 </ul>
-<h2>Boğaziçi University, BS in Mechanical Engineering</h2>
-<ul>
-<li>Sept. 2021 </li>
-<li>Istanbul, Turkey </li>
-</ul>
-<h2>Boğaziçi University, BS in Mechanical Engineering</h2>
-<ul>
-<li>Sept. 2015 to present </li>
-<li>Istanbul, Turkey </li>
-<li>Did this.</li>
-<li>Did that.</li>
-</ul>
 <h2>Boğaziçi University, Mechanical Engineering</h2>
 <ul>
 <li>Sept. 2021 </li>
@@ -562,52 +598,6 @@
 </ul>
 <h2>Boğaziçi University, BS in Mechanical Engineering</h2>
 <ul>
-<li>
-<p>Sept. 2021 </p>
-</li>
-<li>
-<p>Did this.</p>
-</li>
-<li>Did that.</li>
-</ul>
-<h2>Boğaziçi University, BS in Mechanical Engineering</h2>
-<ul>
-<li>Sept. 2021 </li>
-<li>Istanbul, Turkey </li>
-</ul>
-<h2>Boğaziçi University, BS in Mechanical Engineering</h2>
-<ul>
-<li>Jan. 2024 </li>
-<li>Istanbul, Turkey </li>
-<li>Did this.</li>
-<li>Did that.</li>
-</ul>
-<h2>Boğaziçi University, BS in Mechanical Engineering</h2>
-<ul>
-<li>Sept. 2021 </li>
-<li>Istanbul, Turkey </li>
-<li>Did this.</li>
-<li>Did that.</li>
-</ul>
-<h2>Boğaziçi University, Mechanical Engineering</h2>
-<ul>
-<li>Sept. 2021 </li>
-<li>Istanbul, Turkey </li>
-<li>Did this.</li>
-<li>Did that.</li>
-</ul>
-<h2>Boğaziçi University, BS in Mechanical Engineering</h2>
-<ul>
-<li>
-<p>Sept. 2021 </p>
-</li>
-<li>
-<p>Did this.</p>
-</li>
-<li>Did that.</li>
-</ul>
-<h2>Boğaziçi University, BS in Mechanical Engineering</h2>
-<ul>
 <li>Sept. 2021 </li>
 <li>Istanbul, Turkey </li>
 </ul>
@@ -634,6 +624,16 @@
 </ul>
 <h2>Boğaziçi University, BS in Mechanical Engineering</h2>
 <ul>
+<li>
+<p>Sept. 2021 </p>
+</li>
+<li>
+<p>Did this.</p>
+</li>
+<li>Did that.</li>
+</ul>
+<h2>Boğaziçi University, BS in Mechanical Engineering</h2>
+<ul>
 <li>Sept. 2021 </li>
 <li>Istanbul, Turkey </li>
 <li>Did this.</li>
@@ -643,6 +643,10 @@
 <h2>My Project</h2>
 <h2>My Project</h2>
 <ul>
+<li>Istanbul, Turkey </li>
+</ul>
+<h2>My Project</h2>
+<ul>
 <li>Sept. 2015 to present </li>
 </ul>
 <h2>My Project</h2>
@@ -660,7 +664,20 @@
 </ul>
 <h2>My Project</h2>
 <ul>
-<li>Istanbul, Turkey </li>
+<li>Sept. 2015 to present - Istanbul, Turkey </li>
+</ul>
+<h2>My Project</h2>
+<ul>
+<li>Jan. 2024 - Istanbul, Turkey </li>
+</ul>
+<h2>My Project</h2>
+<ul>
+<li>Sept. 2021 - Istanbul, Turkey </li>
+</ul>
+<h2>My Project</h2>
+<ul>
+<li>Istanbul, Turkey - Did this.</li>
+<li>Did that.</li>
 </ul>
 <h2>My Project</h2>
 <ul>
@@ -677,10 +694,6 @@
 </ul>
 <h2>My Project</h2>
 <ul>
-<li>Sept. 2015 to present - Istanbul, Turkey </li>
-</ul>
-<h2>My Project</h2>
-<ul>
 <li>Sept. 2021 </li>
 </ul>
 <h2>My Project</h2>
@@ -690,42 +703,15 @@
 </ul>
 <h2>My Project</h2>
 <ul>
-<li>Jan. 2024 - Istanbul, Turkey </li>
-</ul>
-<h2>My Project</h2>
-<ul>
 <li>Sept. 2021 - Did this.</li>
 <li>Did that.</li>
 </ul>
 <h2>My Project</h2>
 <ul>
-<li>Sept. 2021 - Istanbul, Turkey </li>
-</ul>
-<h2>My Project</h2>
-<ul>
-<li>Istanbul, Turkey - Did this.</li>
-<li>Did that.</li>
-</ul>
-<h2>My Project</h2>
-<ul>
-<li>Sept. 2021 </li>
-</ul>
-<h2>My Project</h2>
-<ul>
-<li>Sept. 2015 to present - Did this.</li>
-<li>Did that.</li>
-</ul>
-<h2>My Project</h2>
-<ul>
 <li>Sept. 2015 to present - Istanbul, Turkey </li>
 </ul>
 <h2>My Project</h2>
 <ul>
-<li>Sept. 2021 - Did this.</li>
-<li>Did that.</li>
-</ul>
-<h2>My Project</h2>
-<ul>
 <li>Sept. 2021 - Istanbul, Turkey </li>
 </ul>
 <h2>My Project</h2>
@@ -735,11 +721,6 @@
 </ul>
 <h2>My Project</h2>
 <ul>
-<li>Sept. 2021 - Did this.</li>
-<li>Did that.</li>
-</ul>
-<h2>My Project</h2>
-<ul>
 <li>Sept. 2021 - Istanbul, Turkey </li>
 </ul>
 <h2>My Project</h2>
@@ -754,6 +735,20 @@
 </ul>
 <h2>My Project</h2>
 <ul>
+<li>Sept. 2021 </li>
+</ul>
+<h2>My Project</h2>
+<ul>
+<li>Sept. 2015 to present - Did this.</li>
+<li>Did that.</li>
+</ul>
+<h2>My Project</h2>
+<ul>
+<li>Sept. 2021 - Did this.</li>
+<li>Did that.</li>
+</ul>
+<h2>My Project</h2>
+<ul>
 <li>Sept. 2021 - Did this.</li>
 <li>Did that.</li>
 </ul>
@@ -778,6 +773,11 @@
 </ul>
 <h2>My Project</h2>
 <ul>
+<li>Sept. 2021 - Did this.</li>
+<li>Did that.</li>
+</ul>
+<h2>My Project</h2>
+<ul>
 <li>Sept. 2021 - Istanbul, Turkey - Did this.</li>
 <li>Did that.</li>
 </ul>
diff --git a/tests/testdata/test_markdown_to_html/sb2nov_empty/None_CV_PASTETOGRAMMARLY.html b/tests/testdata/test_markdown_to_html/sb2nov_empty.html
similarity index 100%
rename from tests/testdata/test_markdown_to_html/sb2nov_empty/None_CV_PASTETOGRAMMARLY.html
rename to tests/testdata/test_markdown_to_html/sb2nov_empty.html
diff --git a/tests/testdata/test_markdown_to_html/sb2nov_filled/John_Doe_CV_PASTETOGRAMMARLY.html b/tests/testdata/test_markdown_to_html/sb2nov_filled.html
similarity index 99%
rename from tests/testdata/test_markdown_to_html/sb2nov_filled/John_Doe_CV_PASTETOGRAMMARLY.html
rename to tests/testdata/test_markdown_to_html/sb2nov_filled.html
index 74372a9a..f4d39553 100644
--- a/tests/testdata/test_markdown_to_html/sb2nov_filled/John_Doe_CV_PASTETOGRAMMARLY.html
+++ b/tests/testdata/test_markdown_to_html/sb2nov_filled.html
@@ -47,6 +47,10 @@
 <h2>Some Company, Software Engineer</h2>
 <h2>Some Company, Software Engineer</h2>
 <ul>
+<li>Istanbul, Turkey </li>
+</ul>
+<h2>Some Company, Software Engineer</h2>
+<ul>
 <li>Sept. 2015 to present </li>
 </ul>
 <h2>Some Company, Software Engineer</h2>
@@ -64,10 +68,27 @@
 </ul>
 <h2>Some Company, Software Engineer</h2>
 <ul>
+<li>Sept. 2015 to present </li>
 <li>Istanbul, Turkey </li>
 </ul>
 <h2>Some Company, Software Engineer</h2>
 <ul>
+<li>Jan. 2024 </li>
+<li>Istanbul, Turkey </li>
+</ul>
+<h2>Some Company, Software Engineer</h2>
+<ul>
+<li>Sept. 2021 </li>
+<li>Istanbul, Turkey </li>
+</ul>
+<h2>Some Company, Software Engineer</h2>
+<ul>
+<li>Istanbul, Turkey </li>
+<li>Did this.</li>
+<li>Did that.</li>
+</ul>
+<h2>Some Company, Software Engineer</h2>
+<ul>
 <li>Sept. 2015 to present </li>
 </ul>
 <h2>Some Company, Software Engineer</h2>
@@ -86,11 +107,6 @@
 </ul>
 <h2>Some Company, Software Engineer</h2>
 <ul>
-<li>Sept. 2015 to present </li>
-<li>Istanbul, Turkey </li>
-</ul>
-<h2>Some Company, Software Engineer</h2>
-<ul>
 <li>Sept. 2021 </li>
 </ul>
 <h2>Some Company, Software Engineer</h2>
@@ -105,11 +121,6 @@
 </ul>
 <h2>Some Company, Software Engineer</h2>
 <ul>
-<li>Jan. 2024 </li>
-<li>Istanbul, Turkey </li>
-</ul>
-<h2>Some Company, Software Engineer</h2>
-<ul>
 <li>
 <p>Sept. 2021 </p>
 </li>
@@ -120,11 +131,36 @@
 </ul>
 <h2>Some Company, Software Engineer</h2>
 <ul>
+<li>Sept. 2015 to present </li>
+<li>Istanbul, Turkey </li>
+</ul>
+<h2>Some Company, Software Engineer</h2>
+<ul>
 <li>Sept. 2021 </li>
 <li>Istanbul, Turkey </li>
 </ul>
 <h2>Some Company, Software Engineer</h2>
 <ul>
+<li>Sept. 2015 to present </li>
+<li>Istanbul, Turkey </li>
+<li>Did this.</li>
+<li>Did that.</li>
+</ul>
+<h2>Some Company, Software Engineer</h2>
+<ul>
+<li>Sept. 2021 </li>
+<li>Istanbul, Turkey </li>
+</ul>
+<h2>Some Company, Software Engineer</h2>
+<ul>
+<li>Jan. 2024 </li>
+<li>Istanbul, Turkey </li>
+<li>Did this.</li>
+<li>Did that.</li>
+</ul>
+<h2>Some Company, Software Engineer</h2>
+<ul>
+<li>Sept. 2021 </li>
 <li>Istanbul, Turkey </li>
 <li>Did this.</li>
 <li>Did that.</li>
@@ -145,11 +181,6 @@
 </ul>
 <h2>Some Company, Software Engineer</h2>
 <ul>
-<li>Sept. 2015 to present </li>
-<li>Istanbul, Turkey </li>
-</ul>
-<h2>Some Company, Software Engineer</h2>
-<ul>
 <li>
 <p>Sept. 2021 </p>
 </li>
@@ -160,47 +191,6 @@
 </ul>
 <h2>Some Company, Software Engineer</h2>
 <ul>
-<li>Sept. 2021 </li>
-<li>Istanbul, Turkey </li>
-</ul>
-<h2>Some Company, Software Engineer</h2>
-<ul>
-<li>Sept. 2015 to present </li>
-<li>Istanbul, Turkey </li>
-<li>Did this.</li>
-<li>Did that.</li>
-</ul>
-<h2>Some Company, Software Engineer</h2>
-<ul>
-<li>
-<p>Sept. 2021 </p>
-</li>
-<li>
-<p>Did this.</p>
-</li>
-<li>Did that.</li>
-</ul>
-<h2>Some Company, Software Engineer</h2>
-<ul>
-<li>Sept. 2021 </li>
-<li>Istanbul, Turkey </li>
-</ul>
-<h2>Some Company, Software Engineer</h2>
-<ul>
-<li>Jan. 2024 </li>
-<li>Istanbul, Turkey </li>
-<li>Did this.</li>
-<li>Did that.</li>
-</ul>
-<h2>Some Company, Software Engineer</h2>
-<ul>
-<li>Sept. 2021 </li>
-<li>Istanbul, Turkey </li>
-<li>Did this.</li>
-<li>Did that.</li>
-</ul>
-<h2>Some Company, Software Engineer</h2>
-<ul>
 <li>
 <p>Sept. 2021 </p>
 </li>
@@ -237,6 +227,16 @@
 </ul>
 <h2>Some Company, Software Engineer</h2>
 <ul>
+<li>
+<p>Sept. 2021 </p>
+</li>
+<li>
+<p>Did this.</p>
+</li>
+<li>Did that.</li>
+</ul>
+<h2>Some Company, Software Engineer</h2>
+<ul>
 <li>Sept. 2021 </li>
 <li>Istanbul, Turkey </li>
 <li>Did this.</li>
@@ -246,6 +246,10 @@
 <h2>Boğaziçi University, Mechanical Engineering</h2>
 <h2>Boğaziçi University, Mechanical Engineering</h2>
 <ul>
+<li>Istanbul, Turkey </li>
+</ul>
+<h2>Boğaziçi University, Mechanical Engineering</h2>
+<ul>
 <li>Sept. 2015 to present </li>
 </ul>
 <h2>Boğaziçi University, Mechanical Engineering</h2>
@@ -261,11 +265,32 @@
 <li>Did this.</li>
 <li>Did that.</li>
 </ul>
+<h2>Boğaziçi University, BS in Mechanical Engineering</h2>
+<h2>Boğaziçi University, Mechanical Engineering</h2>
+<ul>
+<li>Sept. 2015 to present </li>
+<li>Istanbul, Turkey </li>
+</ul>
+<h2>Boğaziçi University, Mechanical Engineering</h2>
+<ul>
+<li>Jan. 2024 </li>
+<li>Istanbul, Turkey </li>
+</ul>
+<h2>Boğaziçi University, Mechanical Engineering</h2>
+<ul>
+<li>Sept. 2021 </li>
+<li>Istanbul, Turkey </li>
+</ul>
 <h2>Boğaziçi University, Mechanical Engineering</h2>
 <ul>
 <li>Istanbul, Turkey </li>
+<li>Did this.</li>
+<li>Did that.</li>
 </ul>
 <h2>Boğaziçi University, BS in Mechanical Engineering</h2>
+<ul>
+<li>Istanbul, Turkey </li>
+</ul>
 <h2>Boğaziçi University, Mechanical Engineering</h2>
 <ul>
 <li>Sept. 2015 to present </li>
@@ -284,11 +309,6 @@
 </li>
 <li>Did that.</li>
 </ul>
-<h2>Boğaziçi University, Mechanical Engineering</h2>
-<ul>
-<li>Sept. 2015 to present </li>
-<li>Istanbul, Turkey </li>
-</ul>
 <h2>Boğaziçi University, BS in Mechanical Engineering</h2>
 <ul>
 <li>Sept. 2015 to present </li>
@@ -307,11 +327,6 @@
 </li>
 <li>Did that.</li>
 </ul>
-<h2>Boğaziçi University, Mechanical Engineering</h2>
-<ul>
-<li>Jan. 2024 </li>
-<li>Istanbul, Turkey </li>
-</ul>
 <h2>Boğaziçi University, BS in Mechanical Engineering</h2>
 <ul>
 <li>Jan. 2024 </li>
@@ -326,29 +341,71 @@
 </li>
 <li>Did that.</li>
 </ul>
-<h2>Boğaziçi University, Mechanical Engineering</h2>
-<ul>
-<li>Sept. 2021 </li>
-<li>Istanbul, Turkey </li>
-</ul>
 <h2>Boğaziçi University, BS in Mechanical Engineering</h2>
 <ul>
 <li>Sept. 2021 </li>
 </ul>
-<h2>Boğaziçi University, Mechanical Engineering</h2>
-<ul>
-<li>Istanbul, Turkey </li>
-<li>Did this.</li>
-<li>Did that.</li>
-</ul>
 <h2>Boğaziçi University, BS in Mechanical Engineering</h2>
 <ul>
 <li>Did this.</li>
 <li>Did that.</li>
 </ul>
+<h2>Boğaziçi University, Mechanical Engineering</h2>
+<ul>
+<li>Sept. 2015 to present </li>
+<li>Istanbul, Turkey </li>
+</ul>
+<h2>Boğaziçi University, Mechanical Engineering</h2>
+<ul>
+<li>Sept. 2021 </li>
+<li>Istanbul, Turkey </li>
+</ul>
+<h2>Boğaziçi University, Mechanical Engineering</h2>
+<ul>
+<li>Sept. 2015 to present </li>
+<li>Istanbul, Turkey </li>
+<li>Did this.</li>
+<li>Did that.</li>
+</ul>
+<h2>Boğaziçi University, BS in Mechanical Engineering</h2>
+<ul>
+<li>Sept. 2015 to present </li>
+<li>Istanbul, Turkey </li>
+</ul>
+<h2>Boğaziçi University, Mechanical Engineering</h2>
+<ul>
+<li>Sept. 2021 </li>
+<li>Istanbul, Turkey </li>
+</ul>
+<h2>Boğaziçi University, Mechanical Engineering</h2>
+<ul>
+<li>Jan. 2024 </li>
+<li>Istanbul, Turkey </li>
+<li>Did this.</li>
+<li>Did that.</li>
+</ul>
+<h2>Boğaziçi University, BS in Mechanical Engineering</h2>
+<ul>
+<li>Jan. 2024 </li>
+<li>Istanbul, Turkey </li>
+</ul>
+<h2>Boğaziçi University, Mechanical Engineering</h2>
+<ul>
+<li>Sept. 2021 </li>
+<li>Istanbul, Turkey </li>
+<li>Did this.</li>
+<li>Did that.</li>
+</ul>
+<h2>Boğaziçi University, BS in Mechanical Engineering</h2>
+<ul>
+<li>Sept. 2021 </li>
+<li>Istanbul, Turkey </li>
+</ul>
 <h2>Boğaziçi University, BS in Mechanical Engineering</h2>
 <ul>
 <li>Istanbul, Turkey </li>
+<li>Did this.</li>
+<li>Did that.</li>
 </ul>
 <h2>Boğaziçi University, Mechanical Engineering</h2>
 <ul>
@@ -364,11 +421,6 @@
 </li>
 <li>Did that.</li>
 </ul>
-<h2>Boğaziçi University, Mechanical Engineering</h2>
-<ul>
-<li>Sept. 2015 to present </li>
-<li>Istanbul, Turkey </li>
-</ul>
 <h2>Boğaziçi University, BS in Mechanical Engineering</h2>
 <ul>
 <li>Sept. 2015 to present </li>
@@ -383,22 +435,10 @@
 </li>
 <li>Did that.</li>
 </ul>
-<h2>Boğaziçi University, Mechanical Engineering</h2>
-<ul>
-<li>Sept. 2021 </li>
-<li>Istanbul, Turkey </li>
-</ul>
 <h2>Boğaziçi University, BS in Mechanical Engineering</h2>
 <ul>
 <li>Sept. 2021 </li>
 </ul>
-<h2>Boğaziçi University, Mechanical Engineering</h2>
-<ul>
-<li>Sept. 2015 to present </li>
-<li>Istanbul, Turkey </li>
-<li>Did this.</li>
-<li>Did that.</li>
-</ul>
 <h2>Boğaziçi University, BS in Mechanical Engineering</h2>
 <ul>
 <li>
@@ -409,11 +449,6 @@
 </li>
 <li>Did that.</li>
 </ul>
-<h2>Boğaziçi University, BS in Mechanical Engineering</h2>
-<ul>
-<li>Sept. 2015 to present </li>
-<li>Istanbul, Turkey </li>
-</ul>
 <h2>Boğaziçi University, Mechanical Engineering</h2>
 <ul>
 <li>
@@ -424,22 +459,10 @@
 </li>
 <li>Did that.</li>
 </ul>
-<h2>Boğaziçi University, Mechanical Engineering</h2>
-<ul>
-<li>Sept. 2021 </li>
-<li>Istanbul, Turkey </li>
-</ul>
 <h2>Boğaziçi University, BS in Mechanical Engineering</h2>
 <ul>
 <li>Sept. 2021 </li>
 </ul>
-<h2>Boğaziçi University, Mechanical Engineering</h2>
-<ul>
-<li>Jan. 2024 </li>
-<li>Istanbul, Turkey </li>
-<li>Did this.</li>
-<li>Did that.</li>
-</ul>
 <h2>Boğaziçi University, BS in Mechanical Engineering</h2>
 <ul>
 <li>
@@ -452,39 +475,6 @@
 </ul>
 <h2>Boğaziçi University, BS in Mechanical Engineering</h2>
 <ul>
-<li>Jan. 2024 </li>
-<li>Istanbul, Turkey </li>
-</ul>
-<h2>Boğaziçi University, Mechanical Engineering</h2>
-<ul>
-<li>Sept. 2021 </li>
-<li>Istanbul, Turkey </li>
-<li>Did this.</li>
-<li>Did that.</li>
-</ul>
-<h2>Boğaziçi University, BS in Mechanical Engineering</h2>
-<ul>
-<li>
-<p>Sept. 2021 </p>
-</li>
-<li>
-<p>Did this.</p>
-</li>
-<li>Did that.</li>
-</ul>
-<h2>Boğaziçi University, BS in Mechanical Engineering</h2>
-<ul>
-<li>Sept. 2021 </li>
-<li>Istanbul, Turkey </li>
-</ul>
-<h2>Boğaziçi University, BS in Mechanical Engineering</h2>
-<ul>
-<li>Istanbul, Turkey </li>
-<li>Did this.</li>
-<li>Did that.</li>
-</ul>
-<h2>Boğaziçi University, Mechanical Engineering</h2>
-<ul>
 <li>
 <p>Sept. 2021 </p>
 </li>
@@ -498,10 +488,6 @@
 <li>Sept. 2021 </li>
 <li>Istanbul, Turkey </li>
 </ul>
-<h2>Boğaziçi University, BS in Mechanical Engineering</h2>
-<ul>
-<li>Sept. 2021 </li>
-</ul>
 <h2>Boğaziçi University, Mechanical Engineering</h2>
 <ul>
 <li>Sept. 2015 to present </li>
@@ -511,6 +497,70 @@
 </ul>
 <h2>Boğaziçi University, BS in Mechanical Engineering</h2>
 <ul>
+<li>Sept. 2015 to present </li>
+<li>Istanbul, Turkey </li>
+</ul>
+<h2>Boğaziçi University, Mechanical Engineering</h2>
+<ul>
+<li>Sept. 2021 </li>
+<li>Istanbul, Turkey </li>
+<li>Did this.</li>
+<li>Did that.</li>
+</ul>
+<h2>Boğaziçi University, BS in Mechanical Engineering</h2>
+<ul>
+<li>Sept. 2021 </li>
+<li>Istanbul, Turkey </li>
+</ul>
+<h2>Boğaziçi University, BS in Mechanical Engineering</h2>
+<ul>
+<li>Sept. 2015 to present </li>
+<li>Istanbul, Turkey </li>
+<li>Did this.</li>
+<li>Did that.</li>
+</ul>
+<h2>Boğaziçi University, Mechanical Engineering</h2>
+<ul>
+<li>Sept. 2021 </li>
+<li>Istanbul, Turkey </li>
+<li>Did this.</li>
+<li>Did that.</li>
+</ul>
+<h2>Boğaziçi University, BS in Mechanical Engineering</h2>
+<ul>
+<li>Sept. 2021 </li>
+<li>Istanbul, Turkey </li>
+</ul>
+<h2>Boğaziçi University, BS in Mechanical Engineering</h2>
+<ul>
+<li>Jan. 2024 </li>
+<li>Istanbul, Turkey </li>
+<li>Did this.</li>
+<li>Did that.</li>
+</ul>
+<h2>Boğaziçi University, BS in Mechanical Engineering</h2>
+<ul>
+<li>Sept. 2021 </li>
+<li>Istanbul, Turkey </li>
+<li>Did this.</li>
+<li>Did that.</li>
+</ul>
+<h2>Boğaziçi University, Mechanical Engineering</h2>
+<ul>
+<li>
+<p>Sept. 2021 </p>
+</li>
+<li>
+<p>Did this.</p>
+</li>
+<li>Did that.</li>
+</ul>
+<h2>Boğaziçi University, BS in Mechanical Engineering</h2>
+<ul>
+<li>Sept. 2021 </li>
+</ul>
+<h2>Boğaziçi University, BS in Mechanical Engineering</h2>
+<ul>
 <li>
 <p>Sept. 2015 to present </p>
 </li>
@@ -521,14 +571,12 @@
 </ul>
 <h2>Boğaziçi University, BS in Mechanical Engineering</h2>
 <ul>
-<li>Sept. 2015 to present </li>
-<li>Istanbul, Turkey </li>
-</ul>
-<h2>Boğaziçi University, Mechanical Engineering</h2>
-<ul>
-<li>Sept. 2021 </li>
-<li>Istanbul, Turkey </li>
-<li>Did this.</li>
+<li>
+<p>Sept. 2021 </p>
+</li>
+<li>
+<p>Did this.</p>
+</li>
 <li>Did that.</li>
 </ul>
 <h2>Boğaziçi University, BS in Mechanical Engineering</h2>
@@ -541,18 +589,6 @@
 </li>
 <li>Did that.</li>
 </ul>
-<h2>Boğaziçi University, BS in Mechanical Engineering</h2>
-<ul>
-<li>Sept. 2021 </li>
-<li>Istanbul, Turkey </li>
-</ul>
-<h2>Boğaziçi University, BS in Mechanical Engineering</h2>
-<ul>
-<li>Sept. 2015 to present </li>
-<li>Istanbul, Turkey </li>
-<li>Did this.</li>
-<li>Did that.</li>
-</ul>
 <h2>Boğaziçi University, Mechanical Engineering</h2>
 <ul>
 <li>Sept. 2021 </li>
@@ -562,52 +598,6 @@
 </ul>
 <h2>Boğaziçi University, BS in Mechanical Engineering</h2>
 <ul>
-<li>
-<p>Sept. 2021 </p>
-</li>
-<li>
-<p>Did this.</p>
-</li>
-<li>Did that.</li>
-</ul>
-<h2>Boğaziçi University, BS in Mechanical Engineering</h2>
-<ul>
-<li>Sept. 2021 </li>
-<li>Istanbul, Turkey </li>
-</ul>
-<h2>Boğaziçi University, BS in Mechanical Engineering</h2>
-<ul>
-<li>Jan. 2024 </li>
-<li>Istanbul, Turkey </li>
-<li>Did this.</li>
-<li>Did that.</li>
-</ul>
-<h2>Boğaziçi University, BS in Mechanical Engineering</h2>
-<ul>
-<li>Sept. 2021 </li>
-<li>Istanbul, Turkey </li>
-<li>Did this.</li>
-<li>Did that.</li>
-</ul>
-<h2>Boğaziçi University, Mechanical Engineering</h2>
-<ul>
-<li>Sept. 2021 </li>
-<li>Istanbul, Turkey </li>
-<li>Did this.</li>
-<li>Did that.</li>
-</ul>
-<h2>Boğaziçi University, BS in Mechanical Engineering</h2>
-<ul>
-<li>
-<p>Sept. 2021 </p>
-</li>
-<li>
-<p>Did this.</p>
-</li>
-<li>Did that.</li>
-</ul>
-<h2>Boğaziçi University, BS in Mechanical Engineering</h2>
-<ul>
 <li>Sept. 2021 </li>
 <li>Istanbul, Turkey </li>
 </ul>
@@ -634,6 +624,16 @@
 </ul>
 <h2>Boğaziçi University, BS in Mechanical Engineering</h2>
 <ul>
+<li>
+<p>Sept. 2021 </p>
+</li>
+<li>
+<p>Did this.</p>
+</li>
+<li>Did that.</li>
+</ul>
+<h2>Boğaziçi University, BS in Mechanical Engineering</h2>
+<ul>
 <li>Sept. 2021 </li>
 <li>Istanbul, Turkey </li>
 <li>Did this.</li>
@@ -643,6 +643,10 @@
 <h2>My Project</h2>
 <h2>My Project</h2>
 <ul>
+<li>Istanbul, Turkey </li>
+</ul>
+<h2>My Project</h2>
+<ul>
 <li>Sept. 2015 to present </li>
 </ul>
 <h2>My Project</h2>
@@ -660,7 +664,20 @@
 </ul>
 <h2>My Project</h2>
 <ul>
-<li>Istanbul, Turkey </li>
+<li>Sept. 2015 to present - Istanbul, Turkey </li>
+</ul>
+<h2>My Project</h2>
+<ul>
+<li>Jan. 2024 - Istanbul, Turkey </li>
+</ul>
+<h2>My Project</h2>
+<ul>
+<li>Sept. 2021 - Istanbul, Turkey </li>
+</ul>
+<h2>My Project</h2>
+<ul>
+<li>Istanbul, Turkey - Did this.</li>
+<li>Did that.</li>
 </ul>
 <h2>My Project</h2>
 <ul>
@@ -677,10 +694,6 @@
 </ul>
 <h2>My Project</h2>
 <ul>
-<li>Sept. 2015 to present - Istanbul, Turkey </li>
-</ul>
-<h2>My Project</h2>
-<ul>
 <li>Sept. 2021 </li>
 </ul>
 <h2>My Project</h2>
@@ -690,42 +703,15 @@
 </ul>
 <h2>My Project</h2>
 <ul>
-<li>Jan. 2024 - Istanbul, Turkey </li>
-</ul>
-<h2>My Project</h2>
-<ul>
 <li>Sept. 2021 - Did this.</li>
 <li>Did that.</li>
 </ul>
 <h2>My Project</h2>
 <ul>
-<li>Sept. 2021 - Istanbul, Turkey </li>
-</ul>
-<h2>My Project</h2>
-<ul>
-<li>Istanbul, Turkey - Did this.</li>
-<li>Did that.</li>
-</ul>
-<h2>My Project</h2>
-<ul>
-<li>Sept. 2021 </li>
-</ul>
-<h2>My Project</h2>
-<ul>
-<li>Sept. 2015 to present - Did this.</li>
-<li>Did that.</li>
-</ul>
-<h2>My Project</h2>
-<ul>
 <li>Sept. 2015 to present - Istanbul, Turkey </li>
 </ul>
 <h2>My Project</h2>
 <ul>
-<li>Sept. 2021 - Did this.</li>
-<li>Did that.</li>
-</ul>
-<h2>My Project</h2>
-<ul>
 <li>Sept. 2021 - Istanbul, Turkey </li>
 </ul>
 <h2>My Project</h2>
@@ -735,11 +721,6 @@
 </ul>
 <h2>My Project</h2>
 <ul>
-<li>Sept. 2021 - Did this.</li>
-<li>Did that.</li>
-</ul>
-<h2>My Project</h2>
-<ul>
 <li>Sept. 2021 - Istanbul, Turkey </li>
 </ul>
 <h2>My Project</h2>
@@ -754,6 +735,20 @@
 </ul>
 <h2>My Project</h2>
 <ul>
+<li>Sept. 2021 </li>
+</ul>
+<h2>My Project</h2>
+<ul>
+<li>Sept. 2015 to present - Did this.</li>
+<li>Did that.</li>
+</ul>
+<h2>My Project</h2>
+<ul>
+<li>Sept. 2021 - Did this.</li>
+<li>Did that.</li>
+</ul>
+<h2>My Project</h2>
+<ul>
 <li>Sept. 2021 - Did this.</li>
 <li>Did that.</li>
 </ul>
@@ -778,6 +773,11 @@
 </ul>
 <h2>My Project</h2>
 <ul>
+<li>Sept. 2021 - Did this.</li>
+<li>Did that.</li>
+</ul>
+<h2>My Project</h2>
+<ul>
 <li>Sept. 2021 - Istanbul, Turkey - Did this.</li>
 <li>Did that.</li>
 </ul>