diff --git a/compiler/AbuseTheForce.vim b/compiler/AbuseTheForce.vim
index 6cb9b61..5d1abe7 100644
--- a/compiler/AbuseTheForce.vim
+++ b/compiler/AbuseTheForce.vim
@@ -18,4 +18,5 @@ endif
 "            \%tarning%*[^:]:\ %m
 
 "set efm=%A\ %#[javac]\ %f:%l:\ %m,%-Z\ %#[javac]\ %p^,%-C%.%#
-CompilerSet makeprg="abusetheforce deploy file " . %:p
+set efm=%f:%l:%c\ %t\ in\ %m
+CompilerSet makeprg=abusetheforce\ deploy\ file\ %
diff --git a/plugin/AbuseTheForce.vim b/plugin/AbuseTheForce.vim
index 0844f21..3a8cbd6 100644
--- a/plugin/AbuseTheForce.vim
+++ b/plugin/AbuseTheForce.vim
@@ -8,6 +8,15 @@ function! AbuseTheForceDeploy()
 
 endfunction
 
+function! AbuseTheForceDeployTest()
+    let filePath = expand("%")
+
+    "let command = "!echo \"" . filePath . "\""
+    let command = "!abusetheforce deploy test \"" . filePath . "\""
+    execute command
+
+endfunction
+
 function! AbuseTheForceRetrieve()
     let filePath = expand("%")
 
@@ -20,9 +29,15 @@ endfunction
 function! AbuseTheForceTarget(...)
 
     if a:0 > 0
-        let target = a:1
 
-        let command = "!abusetheforce target activate \"" . target . "\""
+        if a:1 == "?"
+            let command = "!abusetheforce target list"
+        else
+            let target = a:1
+
+            let command = "!abusetheforce target activate \"" . target . "\""
+        end
+
         execute command
     else
         let command = "!abusetheforce target"
@@ -32,6 +47,7 @@ function! AbuseTheForceTarget(...)
 endfunction
 
 command -nargs=0 ForceDeploy call AbuseTheForceDeploy()         " Deploy current file
+command -nargs=0 ForceDeployTest call AbuseTheForceDeployTest() " Deploy current file and run test
 command -nargs=0 ForceRetrieve call AbuseTheForceRetrieve()     " Retrieve current file
 command -nargs=? ForceTarget call AbuseTheForceTarget(<f-args>) " Change deploy target