diff --git a/autoload/delimitMate.vim b/autoload/delimitMate.vim
index 713829f..5b8140b 100644
--- a/autoload/delimitMate.vim
+++ b/autoload/delimitMate.vim
@@ -1,6 +1,6 @@
 " ============================================================================
 " File:        autoload/delimitMate.vim
-" Version:     2.1
+" Version:     2.2
 " Description: This plugin provides auto-completion for quotes, parens, etc.
 " Maintainer:  Israel Chauca F. <israelchauca@gmail.com>
 " Manual:      Read ":help delimitMate".
diff --git a/autoload/delimitMateTests.vim b/autoload/delimitMateTests.vim
index 77f8374..16ef15a 100644
--- a/autoload/delimitMateTests.vim
+++ b/autoload/delimitMateTests.vim
@@ -1,10 +1,11 @@
-function! delimitMateTests#Main() " {{{
+function! delimitMateTests#Main(known) " {{{
 	if !exists("g:delimitMate_testing")
 		echoerr "delimitMateTests#Main(): If you really want to use me, you must set delimitMate_testing to any value."
 		return
 	endif
 	nmap <F1> :qall!<CR>
 	let b:test_results = {}
+	let b:errors = 0
 
 	function! SetOptions(list) " {{{
 		let b:delimitMate_autoclose = 1
@@ -49,6 +50,7 @@ function! delimitMateTests#Main() " {{{
 			exec "let b:test_results['" . substitute(a:name, "[^a-zA-Z0-9_]", "_", "g") . "'] = 'Passed: ' . text . ' == ' . join(a:output, '<cr>')"
 		else
 			exec "let b:test_results['" . substitute(a:name, "[^a-zA-Z0-9_]", "_", "g") . "'] = 'Failed: ' . text . ' != ' . join(a:output, '<cr>')"
+			let b:errors += 1
 		endif
 	endfunction " }}}
 
@@ -73,6 +75,7 @@ function! delimitMateTests#Main() " {{{
 			exec "let b:test_results['" . substitute(a:name, "[^a-zA-Z0-9_]", "_", "g") . "_R'] = 'Passed: ' . text . ' == ' . join(a:output, '<cr>')"
 		else
 			exec "let b:test_results['" . substitute(a:name, "[^a-zA-Z0-9_]", "_", "g") . "_R'] = 'Failed: ' . text . ' != ' . join(a:output, '<cr>')"
+			let b:errors += 1
 		endif
 	endfunction " }}}
 
@@ -205,12 +208,26 @@ function! delimitMateTests#Main() " {{{
 
 	" Duplicated delimiter after CR
 	call Type("Duplicated delimiter after CR", "(\<CR>", ['(', '|)'], [])
+	" Deactivate on comments
+
+	set ft=vim
+	call Type("Deactivate on comments", "\"()``[]''\"\"", ["\"()``[]''\"\"|"], ["autoclose:0"])
+	set ft=
+
+	" Deactivate parens on comments
+	set ft=vim
+	call Type("Deactivate parens on comments", "\"()", ["\"()"], ["autoclose:0"])
+	set ft=
+
+	" Autoclose and beginning of line
+	call Type("Autoclose and beginning of line", "'\<Left>\<Left>\<Esc>i'", ["'|\"'"], ["autoclose:0"])
 
 	"}}}
 
 	" Show results: {{{
 	normal ggVG"_d
 	call append(0, split(string(b:test_results)[1:-2], ', '))
+	call append(0, "*NEW BROKEN TESTS: " . (b:errors - a:known))
 	normal "_ddgg
 	let @/ = ".\\+Failed:.*!="
 	set nohlsearch
@@ -221,12 +238,16 @@ function! delimitMateTests#Main() " {{{
 	syn match resultPassed "\('Passed: \)\@<=.\+\('$\)\@="
 	syn match resultFailed "\('Failed: \)\@<=.\+\('$\)\@=" contains=resultInequal
 	syn match resultInequal "!="
+	syn match resultSummary "^\*.\+" contains=resultSummaryNumber
+	syn match resultSummaryNumber "[1-9][0-9]*" contained
 
 	hi def link labelPassed Comment
 	hi def link labelFailed Special
 	hi def link resultPassed Ignore
 	hi def link resultFailed Boolean
 	hi def link resultInequal Error
+	hi def link resultSummary SpecialComment
+	hi def link resultSummaryNumber Error
 	" }}}
 endfunction " }}}
 " vim:foldmethod=marker:foldcolumn=4
diff --git a/doc/delimitMate.txt b/doc/delimitMate.txt
index 5b7d055..78f0ad8 100644
--- a/doc/delimitMate.txt
+++ b/doc/delimitMate.txt
@@ -1,4 +1,4 @@
-*delimitMate*    Trying to keep those beasts at bay! v.2.1   *delimitMate.txt*
+*delimitMate*    Trying to keep those beasts at bay! v.2.2   *delimitMate.txt*
 
   =========================================================================  ~
   ====  =========  ==========================  =====  =====================  ~
diff --git a/plugin/delimitMate.vim b/plugin/delimitMate.vim
index 107707a..643ca99 100644
--- a/plugin/delimitMate.vim
+++ b/plugin/delimitMate.vim
@@ -1,6 +1,6 @@
 " ============================================================================
 " File:        plugin/delimitMate.vim
-" Version:     2.1
+" Version:     2.2
 " Description: This plugin provides auto-completion for quotes, parens, etc.
 " Maintainer:  Israel Chauca F. <israelchauca@gmail.com>
 " Manual:      Read ":help delimitMate".
@@ -25,7 +25,7 @@ if v:version < 700
 endif
 
 let s:loaded_delimitMate = 1 " }}}
-let delimitMate_version = '2.1'
+let delimitMate_version = '2.2'
 
 "}}}