Autocmd organization and test runner fix