diff --git a/autoload/delimitMate.vim b/autoload/delimitMate.vim
index 53e9a6a..a282862 100644
--- a/autoload/delimitMate.vim
+++ b/autoload/delimitMate.vim
@@ -582,16 +582,8 @@ endfunction " }}}
 
 " Tools: {{{
 function! delimitMate#TestMappings() "{{{
-	if &modified
-		echohl WarningMsg
-		let answer = input("Modified buffer, type \"yes\" to write and proceed "
-					\ . "with test: ") !~ '\c^yes$'
-		echohl NONE
-		if answer != '\c^yes$'
-			return
-		endif
-		write
-	endif
+	echom 1
+	%d
 	let options = sort(keys(delimitMate#OptionsList()))
 	let optoutput = ['delimitMate Report', '==================', '',
 				\ '* Options: ( ) default, (g) global, (b) buffer','']
@@ -604,8 +596,8 @@ function! delimitMate#TestMappings() "{{{
 
 	" Check if mappings were set. {{{
 	let imaps = s:g('right_delims')
-	let imaps = imaps + ( s:g('autoclose') ? s:g('left_delims') : [] )
-	let imaps = imaps +
+	let imaps += ( s:g('autoclose') ? s:g('left_delims') : [] )
+	let imaps +=
 				\ s:g('quotes_list') +
 				\ s:g('apostrophes_list') +
 				\ ['<BS>', '<S-BS>', '<Del>', '<S-Tab>', '<Esc>'] +
@@ -620,13 +612,8 @@ function! delimitMate#TestMappings() "{{{
 				\ '<C-ScrollWheelLeft>'] +
 				\ ['<ScrollWheelRight>', '<S-ScrollWheelRight>',
 				\ '<C-ScrollWheelRight>']
-	let imaps = imaps + ( s:g('expand_cr') ?  ['<CR>'] : [] )
-	let imaps = imaps + ( s:g('expand_space') ?  ['<Space>'] : [] )
-
-	let vmaps =
-				\ s:g('right_delims') +
-				\ s:g('left_delims') +
-				\ s:g('quotes_list')
+	let imaps += ( s:g('expand_cr') ?  ['<CR>'] : [] )
+	let imaps += ( s:g('expand_space') ?  ['<Space>'] : [] )
 
 	let imappings = []
 	for map in imaps
@@ -635,7 +622,7 @@ function! delimitMate#TestMappings() "{{{
 			let map = '<Bar>'
 		endif
 		redir => output | execute "verbose imap ".map | redir END
-		let imappings = imappings + split(output, '\n')
+		let imappings += split(output, '\n')
 	endfor
 
 	unlet! output
@@ -728,6 +715,7 @@ function! delimitMate#TestMappings() "{{{
 	call append(line('$'), split(setoptions,"\n")
 				\ + ['--------------------'])
 	setlocal nowrap
+	call feedkeys("\<Esc>\<Esc>", 'n')
 endfunction "}}}
 
 function! delimitMate#OptionsList() "{{{
diff --git a/plugin/delimitMate.vim b/plugin/delimitMate.vim
index 722ff8e..9616869 100644
--- a/plugin/delimitMate.vim
+++ b/plugin/delimitMate.vim
@@ -59,7 +59,7 @@ function! s:init() "{{{
 
 	" quotes
 	call s:option_init("quotes", "\" ' `")
-	call s:option_init("quotes_list", split(s:g('quotes'), '\zs'))
+	call s:option_init("quotes_list",split(s:g('quotes'), '\s\+'))
 
 	" nesting_quotes
 	call s:option_init("nesting_quotes", [])
@@ -200,30 +200,16 @@ function! s:Unmap() " {{{
 endfunction " }}} s:Unmap()
 
 function! s:TestMappingsDo() "{{{
-	%d
-	if !exists("g:delimitMate_testing")
-		call delimitMate#TestMappings()
-	else
-		let temp_varsDM = [s:g('expand_space'), s:g('expand_cr'), s:g('autoclose')]
-		for i in [0,1]
-			let b:delimitMate_expand_space = i
-			let b:delimitMate_expand_cr = i
-			for a in [0,1]
-				let b:delimitMate_autoclose = a
-				call s:init()
-				call s:Unmap()
-				call s:Map()
-				call delimitMate#TestMappings()
-				call append(line('$'),'')
-			endfor
-		endfor
-		let b:delimitMate_expand_space = temp_varsDM[0]
-		let b:delimitMate_expand_cr = temp_varsDM[1]
-		let b:delimitMate_autoclose = temp_varsDM[2]
-		unlet temp_varsDM
+	if &modified
+		let confirm = input("Modified buffer, type \"yes\" to write and proceed "
+					\ . "with test: ") ==? 'yes'
+		if !confirm
+			return
+		endif
 	endif
-	normal gg
+	call delimitMate#TestMappings()
 	g/\%^$/d
+	0
 endfunction "}}}
 
 function! s:DelimitMateDo(...) "{{{