diff --git a/config/nvim/lazy-lock.json b/config/nvim/lazy-lock.json
index a71be2b..152e808 100644
--- a/config/nvim/lazy-lock.json
+++ b/config/nvim/lazy-lock.json
@@ -28,6 +28,7 @@
   "onedark.nvim": { "branch": "master", "commit": "8ef51924724d506e515f2d3ac9f959a9eaf38f3d" },
   "plenary.nvim": { "branch": "master", "commit": "499e0743cf5e8075cd32af68baa3946a1c76adf1" },
   "telescope.nvim": { "branch": "master", "commit": "9a82b5b73eba8c8d71bacedd062d20fe6d3c791a" },
+  "toggleterm.nvim": { "branch": "main", "commit": "95204ece0f2a54c89c4395295432f9aeedca7b5f" },
   "tokyonight.nvim": { "branch": "main", "commit": "161114bd39b990995e08dbf941f6821afbdcd666" },
   "treesj": { "branch": "main", "commit": "b1e2976c2d7ba922371cc7f3ab08b75136c27231" },
   "vim-fugitive": { "branch": "master", "commit": "5f0d280b517cacb16f59316659966c7ca5e2bea2" },
diff --git a/config/nvim/lua/config/keymaps.lua b/config/nvim/lua/config/keymaps.lua
index 3de2ce2..75cf985 100644
--- a/config/nvim/lua/config/keymaps.lua
+++ b/config/nvim/lua/config/keymaps.lua
@@ -18,13 +18,9 @@ keymap("n", "<C-p>", ":Telescope find_files<CR>")
 keymap("n", "<C-s>", ":Telescope live_grep<CR>")
 keymap("n", "<C-b>", ":Telescope buffers<CR>")
 
--- SplitJoin
-keymap("n", "gs", ":TSJSplit<CR>", { desc = "Split block" })
-keymap("n", "gj", ":TSJJoin<CR>", { desc = "Join blocks" })
-keymap("n", "gm", ":TSJToggle<CR>", { desc = "SplitJoin togggle" })
-
 -- Formatting
 keymap("n", "<leader>f", vim.lsp.buf.format, { desc = "Format buffer" })
 
 -- LSP
 require("config.keymaps.lsp")
+require("config.keymaps.nvim-test")
diff --git a/config/nvim/lua/config/keymaps/nvim-test.lua b/config/nvim/lua/config/keymaps/nvim-test.lua
new file mode 100644
index 0000000..533dded
--- /dev/null
+++ b/config/nvim/lua/config/keymaps/nvim-test.lua
@@ -0,0 +1,7 @@
+local keymap = vim.keymap.set
+
+keymap("n", "<Leader>t", ":TestFile<CR>")
+keymap("n", "<Leader>s", ":TestNearest<CR>")
+keymap("n", "<Leader>l", ":TestLast<CR>")
+keymap("n", "<Leader>a", ":TestSuite<CR>")
+keymap("n", "<Leader>gt", ":TestVisit<CR>")
diff --git a/config/nvim/lua/config/plugins/nvim-test.lua b/config/nvim/lua/config/plugins/nvim-test.lua
index 56d3422..2a4e6c2 100644
--- a/config/nvim/lua/config/plugins/nvim-test.lua
+++ b/config/nvim/lua/config/plugins/nvim-test.lua
@@ -2,6 +2,12 @@ return {
   "klen/nvim-test",
 
   config = function()
-    require("nvim-test").setup()
+    require("nvim-test").setup({
+      term = "toggleterm",
+      termOpts = {
+        direction = "horizontal",
+        height = 24,
+      },
+    })
   end,
 }
diff --git a/config/nvim/lua/config/plugins/toggleterm.lua b/config/nvim/lua/config/plugins/toggleterm.lua
new file mode 100644
index 0000000..6228344
--- /dev/null
+++ b/config/nvim/lua/config/plugins/toggleterm.lua
@@ -0,0 +1,7 @@
+return {
+  "akinsho/toggleterm.nvim",
+
+  version = "*",
+
+  config = true,
+}
diff --git a/config/nvim/lua/config/plugins/treesj.lua b/config/nvim/lua/config/plugins/treesj.lua
index 28a70ed..5803191 100644
--- a/config/nvim/lua/config/plugins/treesj.lua
+++ b/config/nvim/lua/config/plugins/treesj.lua
@@ -3,6 +3,8 @@ return {
 
   dependencies = { "nvim-treesitter/nvim-treesitter" },
 
+  keys = { "gm", "gj", "gs" },
+
   config = function()
     require("treesj").setup()
   end,
diff --git a/config/nvim/lua/plugins/init.lua b/config/nvim/lua/plugins/init.lua
index 1fe16bb..753b921 100644
--- a/config/nvim/lua/plugins/init.lua
+++ b/config/nvim/lua/plugins/init.lua
@@ -19,6 +19,7 @@ return {
   require("config.plugins.nvim-test"),
   require("config.plugins.nvim-treesitter"),
   require("config.plugins.telescope"),
+  require("config.plugins.toggleterm"),
   require("config.plugins.treesj"),
   require("config.plugins.which-key"),
 }