diff --git a/src/subcommand/commit_subcommand.cpp b/src/subcommand/commit_subcommand.cpp
@@ -1,7 +1,7 @@
 #include <git2.h>
 #include <unistd.h>
 
-#include "commit_subcommand.hpp"
+#include "../subcommand/commit_subcommand.hpp"
 #include "../wrapper/index_wrapper.hpp"
 #include "../wrapper/repository_wrapper.hpp"
 

diff --git a/test/conftest.py b/test/conftest.py
@@ -1,6 +1,8 @@
 import os
 from pathlib import Path
 import pytest
+import subprocess
+
 
 # Fixture to run test in current tmp_path
 @pytest.fixture
@@ -15,7 +17,21 @@ def git2cpp_path():
     return Path(__file__).parent.parent / 'build' / 'git2cpp'
 
 @pytest.fixture
-def rename_git():
-    os.rename("test/data/status_data/embedded_git/", "test/data/status_data/.git/")
+def xtl_clone(git2cpp_path):
+    url = 'https://github.com/xtensor-stack/xtl.git'
+    clone_working_dir = 'test/data'
+
+    clone_cmd = [git2cpp_path, 'clone', url]
+    subprocess.run(clone_cmd, capture_output=True, cwd = clone_working_dir, text=True)
+
     yield
-    os.rename("test/data/status_data/.git/", "test/data/status_data/embedded_git/")
+
+    cleanup_cmd = ['rm', '-rf', 'xtl']
+    subprocess.run(cleanup_cmd, capture_output=True, cwd = clone_working_dir, text=True)
+
+@pytest.fixture
+def git_config(monkeypatch):
+    monkeypatch.setenv("GIT_AUTHOR_NAME", "Jane Doe")
+    monkeypatch.setenv("GIT_AUTHOR_EMAIL", "jane.doe@blabla.com")
+    monkeypatch.setenv("GIT_COMMITTER_NAME", "Jane Doe")
+    monkeypatch.setenv("GIT_COMMITTER_EMAIL", "jane.doe@blabla.com")
diff --git a/test/data/blank_file.txt b/test/data/blank_file.txt
diff --git a/test/data/status_data/embedded_git/COMMIT_EDITMSG b/test/data/status_data/embedded_git/COMMIT_EDITMSG
diff --git a/test/data/status_data/embedded_git/HEAD b/test/data/status_data/embedded_git/HEAD
diff --git a/test/data/status_data/embedded_git/config b/test/data/status_data/embedded_git/config
diff --git a/test/data/status_data/embedded_git/description b/test/data/status_data/embedded_git/description
diff --git a/test/data/status_data/embedded_git/hooks/applypatch-msg.sample b/test/data/status_data/embedded_git/hooks/applypatch-msg.sample
diff --git a/test/data/status_data/embedded_git/hooks/commit-msg.sample b/test/data/status_data/embedded_git/hooks/commit-msg.sample
diff --git a/test/data/status_data/embedded_git/hooks/fsmonitor-watchman.sample b/test/data/status_data/embedded_git/hooks/fsmonitor-watchman.sample
diff --git a/test/data/status_data/embedded_git/hooks/post-update.sample b/test/data/status_data/embedded_git/hooks/post-update.sample
diff --git a/test/data/status_data/embedded_git/hooks/pre-applypatch.sample b/test/data/status_data/embedded_git/hooks/pre-applypatch.sample
diff --git a/test/data/status_data/embedded_git/hooks/pre-commit.sample b/test/data/status_data/embedded_git/hooks/pre-commit.sample
diff --git a/test/data/status_data/embedded_git/hooks/pre-merge-commit.sample b/test/data/status_data/embedded_git/hooks/pre-merge-commit.sample