diff --git a/Readme.md b/Readme.md
index 53d74e6..bfc4881 100644
--- a/Readme.md
+++ b/Readme.md
@@ -28,7 +28,7 @@ If you want to bind those commands to your leader keys, you can do so neverthele
 
 ```vim
 map <leader>T :ExTestRunFile<CR>
-map <leader>t :ExTestRunMethod<CR>
+map <leader>t :ExTestRunTest<CR>
 map <leader>lt :ExTestRunLast<CR>
 ```
 
diff --git a/plugin/extest.vim b/plugin/extest.vim
index b860c52..5079e55 100644
--- a/plugin/extest.vim
+++ b/plugin/extest.vim
@@ -28,7 +28,7 @@ if !exists("g:extest_exunit_run_file_cmd")
   let g:extest_exunit_run_file_cmd = "mix test '%f'"
 endif
 if !exists("g:extest_exunit_run_test_cmd")
-  let g:extest_exunit_run_test_cmd = "mix test '%f'"
+  let g:extest_exunit_run_test_cmd = "mix test '%f:%l'"
 endif
 if !exists("g:extest_amrita_run_file_cmd")
   let g:extest_amrita_run_file_cmd = "mix amrita '%f'"
@@ -91,6 +91,7 @@ endfunction
 let s:framework_identifiers = {}
 let s:framework_identifiers['^\s*test\s*"'] = "exunit"
 let s:framework_identifiers['^\s*use ExUnit.Case\s*'] = "exunit"
+let s:framework_identifiers['^\s*\(should\|with\) \s*"'] = "exunit"
 let s:framework_identifiers['^\s*\(it\|fact\|facts\|describe\|context\|specify\) \s*'] = "amrita"
 let s:framework_identifiers['^\s*use Amrita.Sweet\s*'] = "amrita"
 function s:IdentifyFramework()