diff --git a/.config/nvim/lua/config/copilot.lua b/.config/nvim/lua/config/copilot.lua
index e69de29..7ed6db6 100644
--- a/.config/nvim/lua/config/copilot.lua
+++ b/.config/nvim/lua/config/copilot.lua
@@ -0,0 +1,2 @@
+vim.api.nvim_set_keymap('i', ',,', 'copilot#Accept("<CR>")', { expr = true, silent = true })
+vim.api.nvim_set_keymap('n', '<leader>cs', '<cmd>Copilot panel<CR>', { noremap = true })
diff --git a/.config/nvim/lua/config/general/remaps.lua b/.config/nvim/lua/config/general/remaps.lua
index 776c810..b5b6f10 100644
--- a/.config/nvim/lua/config/general/remaps.lua
+++ b/.config/nvim/lua/config/general/remaps.lua
@@ -81,10 +81,3 @@ vim.api.nvim_set_keymap('n', '<leader>gC', '<cmd>Git commit -a<CR>', options)
 vim.api.nvim_set_keymap("x", "<leader>p", "\"_dP", options)
 vim.api.nvim_set_keymap("n", "<leader>d", "\"_d", options)
 vim.api.nvim_set_keymap("v", "<leader>d", "\"_d", options)
-
-vim.keymap.set('n', '<leader>c', require('osc52').copy_operator, { expr = true })
-vim.keymap.set('n', '<leader>cc', '<leader>c_', {remap = true})
-vim.keymap.set('v', '<leader>c', require('osc52').copy_visual)
-
-vim.api.nvim_set_keymap('i', ',,', 'copilot#Accept("<CR>")', {expr = true, silent = true})
-vim.api.nvim_set_keymap('n', '<leader>cp', '<cmd>Copilot panel<CR>', options)
diff --git a/.config/nvim/lua/config/neotest.lua b/.config/nvim/lua/config/neotest.lua
index b4de069..82b01db 100644
--- a/.config/nvim/lua/config/neotest.lua
+++ b/.config/nvim/lua/config/neotest.lua
@@ -5,7 +5,8 @@ require("neotest").setup({
 })
 
 require("neotest-phpunit")({
-    root_files = { "phpunit.xml" },
-    phpunit_cmd = { "phpunit" },
+    root_files = { "phpunit.xml", "composer.json" },
+    -- phpunit_cmd = { "docker-compose exec fpm ./vendor/bin/phpunit" },
+    phpunit_cmd = { "vendor/bin/phpunit" },
     filter_dirs = { "vendor" }
 })
diff --git a/.config/nvim/lua/config/osc52.lua b/.config/nvim/lua/config/osc52.lua
new file mode 100644
index 0000000..13320b4
--- /dev/null
+++ b/.config/nvim/lua/config/osc52.lua
@@ -0,0 +1,3 @@
+vim.keymap.set('n', '<leader>c', require('osc52').copy_operator, { expr = true })
+vim.keymap.set('n', '<leader>cc', '<leader>c_', { remap = true })
+vim.keymap.set('v', '<leader>c', require('osc52').copy_visual)
diff --git a/.config/nvim/lua/config/telescope.lua b/.config/nvim/lua/config/telescope.lua
index cb7655f..bf6add5 100644
--- a/.config/nvim/lua/config/telescope.lua
+++ b/.config/nvim/lua/config/telescope.lua
@@ -65,7 +65,7 @@ end, options)
 
 vim.keymap.set('n', '<leader>fb', require('telescope.builtin').buffers, options)
 vim.keymap.set('n', '<leader>fo', require('telescope.builtin').oldfiles, options)
-vim.keymap.set('n', '<leader>gr', require('telescope.builtin').lsp_references, options)
+vim.keymap.set('n', 'gr', require('telescope.builtin').lsp_references, options)
 
 vim.keymap.set('n', '<leader>m', require('telescope.builtin').marks, options)
 vim.keymap.set('n', '<leader>ch', require('telescope.builtin').command_history, options)
diff --git a/.config/nvim/lua/packer-plugins.lua b/.config/nvim/lua/packer-plugins.lua
index a3f2236..089fcc3 100644
--- a/.config/nvim/lua/packer-plugins.lua
+++ b/.config/nvim/lua/packer-plugins.lua
@@ -6,9 +6,19 @@ return require('packer').startup(function()
 	use { 'gruvbox-community/gruvbox' }
     use { 'bluz71/vim-moonfly-colors' }
 
-    use { 'github/copilot.vim' }
+    use {
+        'github/copilot.vim',
+        config = function()
+            require('config.copilot')
+        end
+    }
 
-    use {'ojroques/nvim-osc52'}
+    use {
+        'ojroques/nvim-osc52',
+        config = function()
+            require('config.osc52')
+        end
+    }
 
     use { 'SirVer/ultisnips' }