diff --git a/init.lua b/init.lua
index c0c61e3..a0cf341 100644
--- a/init.lua
+++ b/init.lua
@@ -131,7 +131,9 @@ do
 				c = {'<Cmd>cclose<CR>', 'Close quickfix'},
 				n = {'<Cmd>cnext<CR>', 'Next quickfix'},
 				p = {'<Cmd>cprev<CR>', 'Previous quickfix'},
-			}
+			},
+			['<Leader>c'] = {'<Cmd>vert te<CR>', 'Terminal (vsplit)'},
+			['<Leader>C'] = {'<Cmd>tab te<CR>', 'Terminal (tab)'},
 		}
 
 		which_key.register { ['<C-l>'] = {function ()
@@ -412,6 +414,7 @@ require'packer'.startup(function(use)
 				s = {dap.terminate, 'Stop'},
 				b = {dap.toggle_breakpoint, 'Breakpoint'},
 				B = {conditional_breakpoint, 'Conditional breakpoint'},
+				e = {function() dap.set_exception_breakpoints('default') end, 'Exception breakpoints'},
 				o = {dap.step_over, 'Step over'},
 				i = {dap.step_into, 'Step into'},
 				O = {dap.step_out, 'Step out'},
@@ -636,13 +639,13 @@ require'packer'.startup(function(use)
 			}
 		}
 	end}
-	use {'nvim-telescope/telescope-fzf-native.nvim', run = 'make', config = function()
+	use {'nvim-telescope/telescope-fzf-native.nvim', run = 'make', after = 'telescope.nvim', config = function()
 		require'telescope'.load_extension('fzf')
 	end}
-	use {'nvim-telescope/telescope-file-browser.nvim', config = function ()
+	use {'nvim-telescope/telescope-file-browser.nvim', after = 'telescope.nvim', config = function ()
 		require'telescope'.load_extension('file_browser')
 	end}
-	use {'nvim-telescope/telescope-project.nvim', config = function ()
+	use {'nvim-telescope/telescope-project.nvim', after = 'telescope.nvim', config = function ()
 		require'telescope'.load_extension('project')
 	end}
 	use {'nvim-telescope/telescope-ui-select.nvim', after = 'telescope.nvim', config = function ()
@@ -651,9 +654,16 @@ require'packer'.startup(function(use)
 	use {'nvim-telescope/telescope-dap.nvim', after = 'telescope.nvim', config = function()
 		require'telescope'.load_extension'dap'
 	end}
-	use {'debugloop/telescope-undo.nvim', config = function()
+	use {'debugloop/telescope-undo.nvim', after = 'telescope.nvim', config = function()
 		require'telescope'.load_extension('undo')
 	end}
+	use {'nvim-neotest/neotest', requires = {'rcasia/neotest-java'}, config = function()
+		require'neotest'.setup {
+			adapters = {
+				require'neotest-java' {}
+			}
+		}
+	end}
 	use 'kyazdani42/nvim-tree.lua'
 	use 'simrat39/symbols-outline.nvim'
 	use {'folke/which-key.nvim', config = function() require'which-key'.setup() end}