diff --git a/app/tests/__init__.py b/app/tests/__init__.py
index 0f87b58..e69de29 100644
--- a/app/tests/__init__.py
+++ b/app/tests/__init__.py
@@ -1 +0,0 @@
-# This makes app/tests a package
diff --git a/app/tests/integ/__init__.py b/app/tests/integ/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/app/tests/test_api.py b/app/tests/integ/test_api.py
similarity index 100%
rename from app/tests/test_api.py
rename to app/tests/integ/test_api.py
diff --git a/app/tests/test_homepage.py b/app/tests/integ/test_homepage.py
similarity index 100%
rename from app/tests/test_homepage.py
rename to app/tests/integ/test_homepage.py
diff --git a/app/tests/test_releases_queries.py b/app/tests/integ/test_releases_queries.py
similarity index 100%
rename from app/tests/test_releases_queries.py
rename to app/tests/integ/test_releases_queries.py
diff --git a/app/tests/utils.py b/app/tests/integ/utils.py
similarity index 100%
rename from app/tests/utils.py
rename to app/tests/integ/utils.py
diff --git a/app/tests/unit/__init__.py b/app/tests/unit/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/app/tests/unit/test_git.py b/app/tests/unit/test_git.py
new file mode 100644
index 0000000..781b986
--- /dev/null
+++ b/app/tests/unit/test_git.py
@@ -0,0 +1,53 @@
+import os
+
+from app.utils.git import get_latest_tag, get_latest_commit, clone_repo
+
+
+test_repo = "https://gitlab.com/rubenwardy/testmod"
+master_head = "3df40453cd6bb14a069f109b0cc7bbbc275c445c"
+test_branch_head = "51b54f00c3b3d712417a1cc4bfaa6cbdc7aac3fc"
+v4_commit = "c07d27c3a466d2102d1ba5473d172c74e6b3e0d7"
+random_commit = "84a2e53ff046eacbdbb80f3a00c58510885fefca"
+
+
+def test_get_latest_tag():
+	tag, commit = get_latest_tag(test_repo)
+	assert tag == "v4"
+	assert commit == v4_commit
+
+
+def test_get_latest_commit():
+	assert get_latest_commit(test_repo) == master_head
+	assert get_latest_commit(test_repo, "test-branch") == test_branch_head
+
+
+def test_git_clone_head():
+	with clone_repo(test_repo, recursive=True) as repo:
+		assert repo.head.commit.hexsha == master_head
+		assert os.path.isfile(os.path.join(repo.working_tree_dir, "init.lua"))
+		assert os.path.isfile(os.path.join(repo.working_tree_dir, "chatcmdbuilder", "init.lua"))
+		assert not os.path.isfile(os.path.join(repo.working_tree_dir, "test-branch.txt"))
+
+
+def test_git_clone_branch():
+	with clone_repo(test_repo, "test-branch", recursive=True) as repo:
+		assert repo.head.commit.hexsha == test_branch_head
+		assert os.path.isfile(os.path.join(repo.working_tree_dir, "init.lua"))
+		assert os.path.isfile(os.path.join(repo.working_tree_dir, "chatcmdbuilder", "init.lua"))
+		assert os.path.isfile(os.path.join(repo.working_tree_dir, "test-branch.txt"))
+
+
+def test_git_clone_tag():
+	with clone_repo(test_repo, "v4", recursive=True) as repo:
+		assert repo.head.commit.hexsha == v4_commit
+		assert os.path.isfile(os.path.join(repo.working_tree_dir, "init.lua"))
+		assert not os.path.isfile(os.path.join(repo.working_tree_dir, "chatcmdbuilder", "init.lua"))
+		assert not os.path.isfile(os.path.join(repo.working_tree_dir, "test-branch.txt"))
+
+
+def test_git_clone_commit():
+	with clone_repo(test_repo, random_commit, recursive=True) as repo:
+		assert repo.head.commit.hexsha == random_commit
+		assert os.path.isfile(os.path.join(repo.working_tree_dir, "init.lua"))
+		assert not os.path.isfile(os.path.join(repo.working_tree_dir, "chatcmdbuilder", "init.lua"))
+		assert not os.path.isfile(os.path.join(repo.working_tree_dir, "test-branch.txt"))
diff --git a/app/utils/git.py b/app/utils/git.py
index 7d800f9..fad9465 100644
--- a/app/utils/git.py
+++ b/app/utils/git.py
@@ -60,8 +60,9 @@ def clone_repo(urlstr, ref=None, recursive=False):
 			origin.fetch()
 			repo.git.checkout(ref)
 
-			for submodule in repo.submodules:
-				submodule.update(init=True)
+			if recursive:
+				for submodule in repo.submodules:
+					submodule.update(init=True)
 
 		yield repo
 		shutil.rmtree(gitDir)