diff --git a/test/expand.vim b/test/expand.vim
index 59796d4..b72e964 100644
--- a/test/expand.vim
+++ b/test/expand.vim
@@ -172,6 +172,32 @@ function! s:suite.custom_type_void_string_array()
 endfunction
 
 function! s:suite.custom_void_string_array_2()
+  function! Custom()
+    return [[''], [''], ['']]
+  endfunction
+  let g:lightline = { 'component_expand': { 'custom': 'Custom' } }
+  call lightline#init()
+  call s:assert.equals(SID('expand')([['readonly', 'filename'], ['custom'], ['modified']]),
+        \ [[['readonly', 'filename'], ['modified']], [[0, 0], [0]], [0, 2, 3]])
+  call s:assert.equals(SID('expand')([['readonly', 'filename', 'custom', 'modified']]),
+        \ [[['readonly', 'filename', 'modified']], [[0, 0, 0]], [0, 1]])
+  delfunction Custom
+endfunction
+
+function! s:suite.custom_type_void_string_array_2()
+  function! Custom()
+    return [[''], [''], ['']]
+  endfunction
+  let g:lightline = { 'component_expand': { 'custom': 'Custom' }, 'component_type': { 'custom': 'custom' } }
+  call lightline#init()
+  call s:assert.equals(SID('expand')([['readonly', 'filename'], ['custom'], ['modified']]),
+        \ [[['readonly', 'filename'], ['modified']], [[0, 0], [0]], [0, 2, 3]])
+  call s:assert.equals(SID('expand')([['readonly', 'filename', 'custom', 'modified']]),
+        \ [[['readonly', 'filename', 'modified']], [[0, 0, 0]], [0, 1]])
+  delfunction Custom
+endfunction
+
+function! s:suite.custom_void_string_array_3()
   function! Custom()
     return ['', 'custom', '']
   endfunction
@@ -184,7 +210,7 @@ function! s:suite.custom_void_string_array_2()
   delfunction Custom
 endfunction
 
-function! s:suite.custom_type_void_string_array_2()
+function! s:suite.custom_type_void_string_array_3()
   function! Custom()
     return ['', 'custom', '']
   endfunction
@@ -197,6 +223,32 @@ function! s:suite.custom_type_void_string_array_2()
   delfunction Custom
 endfunction
 
+function! s:suite.custom_void_string_array_4()
+  function! Custom()
+    return [[''], ['custom'], ['']]
+  endfunction
+  let g:lightline = { 'component_expand': { 'custom': 'Custom' } }
+  call lightline#init()
+  call s:assert.equals(SID('expand')([['readonly', 'filename'], ['custom'], ['modified']]),
+        \ [[['readonly', 'filename'], ['custom'], ['modified']], [[0, 0], [1], [0]], [0, 1, 2, 3]])
+  call s:assert.equals(SID('expand')([['readonly', 'filename', 'custom', 'modified']]),
+        \ [[['readonly', 'filename', 'custom', 'modified']], [[0, 0, 1, 0]], [0, 1]])
+  delfunction Custom
+endfunction
+
+function! s:suite.custom_type_void_string_array_4()
+  function! Custom()
+    return [[''], ['custom'], ['']]
+  endfunction
+  let g:lightline = { 'component_expand': { 'custom': 'Custom' }, 'component_type': { 'custom': 'custom' } }
+  call lightline#init()
+  call s:assert.equals(SID('expand')([['readonly', 'filename'], ['custom'], ['modified']]),
+        \ [[['readonly', 'filename'], ['custom'], ['modified']], [[0, 0], [1], [0]], [0, 'custom', 2, 3]])
+  call s:assert.equals(SID('expand')([['readonly', 'filename', 'custom', 'modified']]),
+        \ [[['readonly', 'filename'], ['custom'], ['modified']], [[0, 0], [1], [0]], [0, 'custom', 0, 1]])
+  delfunction Custom
+endfunction
+
 function! s:suite.custom_one()
   function! Custom()
     return [ 'left' ]
@@ -275,6 +327,32 @@ function! s:suite.custom_type_mixed()
   delfunction Custom
 endfunction
 
+function! s:suite.custom_mixed_2()
+  function! Custom()
+    return [['left', ''], ['', { 'custom': 24 }, ''], [[function('tr')], '']]
+  endfunction
+  let g:lightline = { 'component_expand': { 'custom': 'Custom' } }
+  call lightline#init()
+  call s:assert.equals(SID('expand')([['readonly', 'filename'], ['custom'], ['modified']]),
+        \ [[['readonly', 'filename'], ['left', '{''custom'': 24}', '[function(''tr'')]'], ['modified']], [[0, 0], [1, 1, 1], [0]], [0, 1, 2, 3]])
+  call s:assert.equals(SID('expand')([['readonly', 'filename', 'custom', 'modified']]),
+        \ [[['readonly', 'filename', 'left', '{''custom'': 24}', '[function(''tr'')]', 'modified']], [[0, 0, 1, 1, 1, 0]], [0, 1]])
+  delfunction Custom
+endfunction
+
+function! s:suite.custom_type_mixed_2()
+  function! Custom()
+    return [['left', ''], ['', { 'custom': 24 }, ''], [[function('tr')], '']]
+  endfunction
+  let g:lightline = { 'component_expand': { 'custom': 'Custom' }, 'component_type': { 'custom': 'custom' } }
+  call lightline#init()
+  call s:assert.equals(SID('expand')([['readonly', 'filename'], ['custom'], ['modified']]),
+        \ [[['readonly', 'filename'], ['left'], ['{''custom'': 24}'], ['[function(''tr'')]'], ['modified']], [[0, 0], [1], [1], [1], [0]], [0, 1, 'custom', 1, 2, 3]])
+  call s:assert.equals(SID('expand')([['readonly', 'filename', 'custom', 'modified']]),
+        \ [[['readonly', 'filename', 'left'], ['{''custom'': 24}'], ['[function(''tr'')]', 'modified']], [[0, 0, 1], [1], [1, 0]], [0, 'custom', 0, 1]])
+  delfunction Custom
+endfunction
+
 function! s:suite.custom_error()
   function! Custom()
     throw 'error'