diff --git a/t/commands.vim b/t/commands.vim
index ee651b62..fe3ad2cc 100644
--- a/t/commands.vim
+++ b/t/commands.vim
@@ -9,21 +9,34 @@ describe 'commands'
     Expect exists('#airline') to_be_true
   end
 
-  it 'should toggle whitespace off and on'
+  it 'should toggle whitespace off'
     call airline#extensions#load()
     execute 'AirlineToggleWhitespace'
     Expect exists('#airline_whitespace') to_be_false
+  end
+
+  it 'should toggle whitespace on'
+    call airline#extensions#load()
     execute 'AirlineToggleWhitespace'
     Expect exists('#airline_whitespace') to_be_true
   end
 
-  it 'should display theme name with no args'
+  it 'should display theme name "simple"'
     execute 'AirlineTheme simple'
     Expect g:airline_theme == 'simple'
+  end
+
+  it 'should display theme name "dark"'
     execute 'AirlineTheme dark'
     Expect g:airline_theme == 'dark'
+  end
+
+  it 'should display theme name "dark" because specifying a name that does not exist'
     execute 'AirlineTheme doesnotexist'
     Expect g:airline_theme == 'dark'
+  end
+
+  it 'should display theme name molokai'
     colors molokai
     Expect g:airline_theme == 'molokai'
   end
diff --git a/t/extensions_default.vim b/t/extensions_default.vim
index 00d4b04d..f2b07bce 100644
--- a/t/extensions_default.vim
+++ b/t/extensions_default.vim
@@ -11,13 +11,33 @@ describe 'default'
     let s:builder = airline#builder#new({'active': 1})
   end
 
-  it 'should use the layout'
+  it 'should use the layout "airline_a_to_airline_b"'
     call airline#extensions#default#apply(s:builder, { 'winnr': 1, 'active': 1 })
     let stl = s:builder.build()
     Expect stl =~ 'airline_c_to_airline_a'
+  end
+
+  it 'should use the layout "airline_a_to_airline_b"'
+    call airline#extensions#default#apply(s:builder, { 'winnr': 1, 'active': 1 })
+    let stl = s:builder.build()
     Expect stl =~ 'airline_a_to_airline_b'
+  end
+
+  it 'should use the layout "airline_b_to_airline_warning"'
+    call airline#extensions#default#apply(s:builder, { 'winnr': 1, 'active': 1 })
+    let stl = s:builder.build()
     Expect stl =~ 'airline_b_to_airline_warning'
+  end
+
+  it 'should use the layout "airline_x_to_airline_z"'
+    call airline#extensions#default#apply(s:builder, { 'winnr': 1, 'active': 1 })
+    let stl = s:builder.build()
     Expect stl =~ 'airline_x_to_airline_z'
+  end
+
+  it 'should use the layout "airline_z_to_airline_y"'
+    call airline#extensions#default#apply(s:builder, { 'winnr': 1, 'active': 1 })
+    let stl = s:builder.build()
     Expect stl =~ 'airline_z_to_airline_y'
   end