deduce test names on failures

1 files changed, 438 insertions, 533 deletions

diff --git a/text_tests.lua b/text_tests.lua
index 1d5113f..0384b0b 100644
--- a/text_tests.lua
+++ b/text_tests.lua
@@ -1,21 +1,19 @@
 -- major tests for text editing flows
 
 function test_initial_state()
-  io.write('\ntest_initial_state')
   App.screen.init{width=120, height=60}
   Editor_state = edit.initialize_test_state()
   Editor_state.lines = load_array{}
   Text.redraw_all(Editor_state)
   edit.draw(Editor_state)
-  check_eq(#Editor_state.lines, 1, 'F - test_initial_state/#lines')
-  check_eq(Editor_state.cursor1.line, 1, 'F - test_initial_state/cursor:line')
-  check_eq(Editor_state.cursor1.pos, 1, 'F - test_initial_state/cursor:pos')
-  check_eq(Editor_state.screen_top1.line, 1, 'F - test_initial_state/screen_top:line')
-  check_eq(Editor_state.screen_top1.pos, 1, 'F - test_initial_state/screen_top:pos')
+  check_eq(#Editor_state.lines, 1, '#lines')
+  check_eq(Editor_state.cursor1.line, 1, 'cursor:line')
+  check_eq(Editor_state.cursor1.pos, 1, 'cursor:pos')
+  check_eq(Editor_state.screen_top1.line, 1, 'screen_top:line')
+  check_eq(Editor_state.screen_top1.pos, 1, 'screen_top:pos')
 end
 
 function test_click_to_create_drawing()
-  io.write('\ntest_click_to_create_drawing')
   App.screen.init{width=120, height=60}
   Editor_state = edit.initialize_test_state()
   Editor_state.lines = load_array{}
@@ -23,12 +21,11 @@ function test_click_to_create_drawing()
   edit.draw(Editor_state)
   edit.run_after_mouse_click(Editor_state, 8,Editor_state.top+8, 1)
   -- cursor skips drawing to always remain on text
-  check_eq(#Editor_state.lines, 2, 'F - test_click_to_create_drawing/#lines')
-  check_eq(Editor_state.cursor1.line, 2, 'F - test_click_to_create_drawing/cursor')
+  check_eq(#Editor_state.lines, 2, '#lines')
+  check_eq(Editor_state.cursor1.line, 2, 'cursor')
 end
 
 function test_backspace_to_delete_drawing()
-  io.write('\ntest_backspace_to_delete_drawing')
   -- display a drawing followed by a line of text (you shouldn't ever have a drawing right at the end)
   App.screen.init{width=120, height=60}
   Editor_state = edit.initialize_test_state()
@@ -38,12 +35,11 @@ function test_backspace_to_delete_drawing()
   Editor_state.cursor1.line = 2
   -- backspacing deletes the drawing
   edit.run_after_keychord(Editor_state, 'backspace')
-  check_eq(#Editor_state.lines, 1, 'F - test_backspace_to_delete_drawing/#lines')
-  check_eq(Editor_state.cursor1.line, 1, 'F - test_backspace_to_delete_drawing/cursor')
+  check_eq(#Editor_state.lines, 1, '#lines')
+  check_eq(Editor_state.cursor1.line, 1, 'cursor')
 end
 
 function test_backspace_from_start_of_final_line()
-  io.write('\ntest_backspace_from_start_of_final_line')
   -- display final line of text with cursor at start of it
   App.screen.init{width=120, height=60}
   Editor_state = edit.initialize_test_state()
@@ -53,13 +49,12 @@ function test_backspace_from_start_of_final_line()
   Text.redraw_all(Editor_state)
   -- backspace scrolls up
   edit.run_after_keychord(Editor_state, 'backspace')
-  check_eq(#Editor_state.lines, 1, 'F - test_backspace_from_start_of_final_line/#lines')
-  check_eq(Editor_state.cursor1.line, 1, 'F - test_backspace_from_start_of_final_line/cursor')
-  check_eq(Editor_state.screen_top1.line, 1, 'F - test_backspace_from_start_of_final_line/screen_top')
+  check_eq(#Editor_state.lines, 1, '#lines')
+  check_eq(Editor_state.cursor1.line, 1, 'cursor')
+  check_eq(Editor_state.screen_top1.line, 1, 'screen_top')
 end
 
 function test_insert_first_character()
-  io.write('\ntest_insert_first_character')
   App.screen.init{width=120, height=60}
   Editor_state = edit.initialize_test_state()
   Editor_state.lines = load_array{}
@@ -67,11 +62,10 @@ function test_insert_first_character()
   edit.draw(Editor_state)
   edit.run_after_text_input(Editor_state, 'a')
   local y = Editor_state.top
-  App.screen.check(y, 'a', 'F - test_insert_first_character/screen:1')
+  App.screen.check(y, 'a', 'screen:1')
 end
 
 function test_press_ctrl()
-  io.write('\ntest_press_ctrl')
   -- press ctrl while the cursor is on text
   App.screen.init{width=50, height=80}
   Editor_state = edit.initialize_test_state()
@@ -84,7 +78,6 @@ function test_press_ctrl()
 end
 
 function test_move_left()
-  io.write('\ntest_move_left')
   App.screen.init{width=120, height=60}
   Editor_state = edit.initialize_test_state()
   Editor_state.lines = load_array{'a'}
@@ -92,11 +85,10 @@ function test_move_left()
   Editor_state.cursor1 = {line=1, pos=2}
   edit.draw(Editor_state)
   edit.run_after_keychord(Editor_state, 'left')
-  check_eq(Editor_state.cursor1.pos, 1, 'F - test_move_left')
+  check_eq(Editor_state.cursor1.pos, 1, 'check')
 end
 
 function test_move_right()
-  io.write('\ntest_move_right')
   App.screen.init{width=120, height=60}
   Editor_state = edit.initialize_test_state()
   Editor_state.lines = load_array{'a'}
@@ -104,11 +96,10 @@ function test_move_right()
   Editor_state.cursor1 = {line=1, pos=1}
   edit.draw(Editor_state)
   edit.run_after_keychord(Editor_state, 'right')
-  check_eq(Editor_state.cursor1.pos, 2, 'F - test_move_right')
+  check_eq(Editor_state.cursor1.pos, 2, 'check')
 end
 
 function test_move_left_to_previous_line()
-  io.write('\ntest_move_left_to_previous_line')
   App.screen.init{width=120, height=60}
   Editor_state = edit.initialize_test_state()
   Editor_state.lines = load_array{'abc', 'def'}
@@ -116,12 +107,11 @@ function test_move_left_to_previous_line()
   Editor_state.cursor1 = {line=2, pos=1}
   edit.draw(Editor_state)
   edit.run_after_keychord(Editor_state, 'left')
-  check_eq(Editor_state.cursor1.line, 1, 'F - test_move_left_to_previous_line/line')
-  check_eq(Editor_state.cursor1.pos, 4, 'F - test_move_left_to_previous_line/pos')  -- past end of line
+  check_eq(Editor_state.cursor1.line, 1, 'line')
+  check_eq(Editor_state.cursor1.pos, 4, 'pos')  -- past end of line
 end
 
 function test_move_right_to_next_line()
-  io.write('\ntest_move_right_to_next_line')
   App.screen.init{width=120, height=60}
   Editor_state = edit.initialize_test_state()
   Editor_state.lines = load_array{'abc', 'def'}
@@ -129,12 +119,11 @@ function test_move_right_to_next_line()
   Editor_state.cursor1 = {line=1, pos=4}  -- past end of line
   edit.draw(Editor_state)
   edit.run_after_keychord(Editor_state, 'right')
-  check_eq(Editor_state.cursor1.line, 2, 'F - test_move_right_to_next_line/line')
-  check_eq(Editor_state.cursor1.pos, 1, 'F - test_move_right_to_next_line/pos')
+  check_eq(Editor_state.cursor1.line, 2, 'line')
+  check_eq(Editor_state.cursor1.pos, 1, 'pos')
 end
 
 function test_move_to_start_of_word()
-  io.write('\ntest_move_to_start_of_word')
   App.screen.init{width=120, height=60}
   Editor_state = edit.initialize_test_state()
   Editor_state.lines = load_array{'abc'}
@@ -142,11 +131,10 @@ function test_move_to_start_of_word()
   Editor_state.cursor1 = {line=1, pos=3}
   edit.draw(Editor_state)
   edit.run_after_keychord(Editor_state, 'M-left')
-  check_eq(Editor_state.cursor1.pos, 1, 'F - test_move_to_start_of_word')
+  check_eq(Editor_state.cursor1.pos, 1, 'check')
 end
 
 function test_move_to_start_of_previous_word()
-  io.write('\ntest_move_to_start_of_previous_word')
   App.screen.init{width=120, height=60}
   Editor_state = edit.initialize_test_state()
   Editor_state.lines = load_array{'abc def'}
@@ -154,11 +142,10 @@ function test_move_to_start_of_previous_word()
   Editor_state.cursor1 = {line=1, pos=4}  -- at the space between words
   edit.draw(Editor_state)
   edit.run_after_keychord(Editor_state, 'M-left')
-  check_eq(Editor_state.cursor1.pos, 1, 'F - test_move_to_start_of_previous_word')
+  check_eq(Editor_state.cursor1.pos, 1, 'check')
 end
 
 function test_skip_to_previous_word()
-  io.write('\ntest_skip_to_previous_word')
   App.screen.init{width=120, height=60}
   Editor_state = edit.initialize_test_state()
   Editor_state.lines = load_array{'abc def'}
@@ -166,11 +153,10 @@ function test_skip_to_previous_word()
   Editor_state.cursor1 = {line=1, pos=5}  -- at the start of second word
   edit.draw(Editor_state)
   edit.run_after_keychord(Editor_state, 'M-left')
-  check_eq(Editor_state.cursor1.pos, 1, 'F - test_skip_to_previous_word')
+  check_eq(Editor_state.cursor1.pos, 1, 'check')
 end
 
 function test_skip_past_tab_to_previous_word()
-  io.write('\ntest_skip_past_tab_to_previous_word')
   App.screen.init{width=120, height=60}
   Editor_state = edit.initialize_test_state()
   Editor_state.lines = load_array{'abc def\tghi'}
@@ -178,11 +164,10 @@ function test_skip_past_tab_to_previous_word()
   Editor_state.cursor1 = {line=1, pos=10}  -- within third word
   edit.draw(Editor_state)
   edit.run_after_keychord(Editor_state, 'M-left')
-  check_eq(Editor_state.cursor1.pos, 9, 'F - test_skip_past_tab_to_previous_word')
+  check_eq(Editor_state.cursor1.pos, 9, 'check')
 end
 
 function test_skip_multiple_spaces_to_previous_word()
-  io.write('\ntest_skip_multiple_spaces_to_previous_word')
   App.screen.init{width=120, height=60}
   Editor_state = edit.initialize_test_state()
   Editor_state.lines = load_array{'abc  def'}
@@ -190,11 +175,10 @@ function test_skip_multiple_spaces_to_previous_word()
   Editor_state.cursor1 = {line=1, pos=6}  -- at the start of second word
   edit.draw(Editor_state)
   edit.run_after_keychord(Editor_state, 'M-left')
-  check_eq(Editor_state.cursor1.pos, 1, 'F - test_skip_multiple_spaces_to_previous_word')
+  check_eq(Editor_state.cursor1.pos, 1, 'check')
 end
 
 function test_move_to_start_of_word_on_previous_line()
-  io.write('\ntest_move_to_start_of_word_on_previous_line')
   App.screen.init{width=120, height=60}
   Editor_state = edit.initialize_test_state()
   Editor_state.lines = load_array{'abc def', 'ghi'}
@@ -202,12 +186,11 @@ function test_move_to_start_of_word_on_previous_line()
   Editor_state.cursor1 = {line=2, pos=1}
   edit.draw(Editor_state)
   edit.run_after_keychord(Editor_state, 'M-left')
-  check_eq(Editor_state.cursor1.line, 1, 'F - test_move_to_start_of_word_on_previous_line/line')
-  check_eq(Editor_state.cursor1.pos, 5, 'F - test_move_to_start_of_word_on_previous_line/pos')
+  check_eq(Editor_state.cursor1.line, 1, 'line')
+  check_eq(Editor_state.cursor1.pos, 5, 'pos')
 end
 
 function test_move_past_end_of_word()
-  io.write('\ntest_move_past_end_of_word')
   App.screen.init{width=120, height=60}
   Editor_state = edit.initialize_test_state()
   Editor_state.lines = load_array{'abc def'}
@@ -215,11 +198,10 @@ function test_move_past_end_of_word()
   Editor_state.cursor1 = {line=1, pos=1}
   edit.draw(Editor_state)
   edit.run_after_keychord(Editor_state, 'M-right')
-  check_eq(Editor_state.cursor1.pos, 4, 'F - test_move_past_end_of_word')
+  check_eq(Editor_state.cursor1.pos, 4, 'check')
 end
 
 function test_skip_to_next_word()
-  io.write('\ntest_skip_to_next_word')
   App.screen.init{width=120, height=60}
   Editor_state = edit.initialize_test_state()
   Editor_state.lines = load_array{'abc def'}
@@ -227,11 +209,10 @@ function test_skip_to_next_word()
   Editor_state.cursor1 = {line=1, pos=4}  -- at the space between words
   edit.draw(Editor_state)
   edit.run_after_keychord(Editor_state, 'M-right')
-  check_eq(Editor_state.cursor1.pos, 8, 'F - test_skip_to_next_word')
+  check_eq(Editor_state.cursor1.pos, 8, 'check')
 end
 
 function test_skip_past_tab_to_next_word()
-  io.write('\ntest_skip_past_tab_to_next_word')
   App.screen.init{width=120, height=60}
   Editor_state = edit.initialize_test_state()
   Editor_state.lines = load_array{'abc\tdef'}
@@ -239,11 +220,10 @@ function test_skip_past_tab_to_next_word()
   Editor_state.cursor1 = {line=1, pos=1}  -- at the space between words
   edit.draw(Editor_state)
   edit.run_after_keychord(Editor_state, 'M-right')
-  check_eq(Editor_state.cursor1.pos, 4, 'F - test_skip_past_tab_to_next_word')
+  check_eq(Editor_state.cursor1.pos, 4, 'check')
 end
 
 function test_skip_multiple_spaces_to_next_word()
-  io.write('\ntest_skip_multiple_spaces_to_next_word')
   App.screen.init{width=120, height=60}
   Editor_state = edit.initialize_test_state()
   Editor_state.lines = load_array{'abc  def'}
@@ -251,11 +231,10 @@ function test_skip_multiple_spaces_to_next_word()
   Editor_state.cursor1 = {line=1, pos=4}  -- at the start of second word
   edit.draw(Editor_state)
   edit.run_after_keychord(Editor_state, 'M-right')
-  check_eq(Editor_state.cursor1.pos, 9, 'F - test_skip_multiple_spaces_to_next_word')
+  check_eq(Editor_state.cursor1.pos, 9, 'check')
 end
 
 function test_move_past_end_of_word_on_next_line()
-  io.write('\ntest_move_past_end_of_word_on_next_line')
   App.screen.init{width=120, height=60}
   Editor_state = edit.initialize_test_state()
   Editor_state.lines = load_array{'abc def', 'ghi'}
@@ -263,12 +242,11 @@ function test_move_past_end_of_word_on_next_line()
   Editor_state.cursor1 = {line=1, pos=8}
   edit.draw(Editor_state)
   edit.run_after_keychord(Editor_state, 'M-right')
-  check_eq(Editor_state.cursor1.line, 2, 'F - test_move_past_end_of_word_on_next_line/line')
-  check_eq(Editor_state.cursor1.pos, 4, 'F - test_move_past_end_of_word_on_next_line/pos')
+  check_eq(Editor_state.cursor1.line, 2, 'line')
+  check_eq(Editor_state.cursor1.pos, 4, 'pos')
 end
 
 function test_click_moves_cursor()
-  io.write('\ntest_click_moves_cursor')
   App.screen.init{width=50, height=60}
   Editor_state = edit.initialize_test_state()
   Editor_state.lines = load_array{'abc', 'def', 'xyz'}
@@ -279,15 +257,14 @@ function test_click_moves_cursor()
   Editor_state.selection1 = {}
   edit.draw(Editor_state)  -- populate line_cache.starty for each line Editor_state.line_cache
   edit.run_after_mouse_release(Editor_state, Editor_state.left+8,Editor_state.top+5, 1)
-  check_eq(Editor_state.cursor1.line, 1, 'F - test_click_moves_cursor/cursor:line')
-  check_eq(Editor_state.cursor1.pos, 2, 'F - test_click_moves_cursor/cursor:pos')
+  check_eq(Editor_state.cursor1.line, 1, 'cursor:line')
+  check_eq(Editor_state.cursor1.pos, 2, 'cursor:pos')
   -- selection is empty to avoid perturbing future edits
-  check_nil(Editor_state.selection1.line, 'F - test_click_moves_cursor/selection:line')
-  check_nil(Editor_state.selection1.pos, 'F - test_click_moves_cursor/selection:pos')
+  check_nil(Editor_state.selection1.line, 'selection:line')
+  check_nil(Editor_state.selection1.pos, 'selection:pos')
 end
 
 function test_click_to_left_of_line()
-  io.write('\ntest_click_to_left_of_line')
   -- display a line with the cursor in the middle
   App.screen.init{width=50, height=80}
   Editor_state = edit.initialize_test_state()
@@ -300,13 +277,12 @@ function test_click_to_left_of_line()
   edit.draw(Editor_state)
   edit.run_after_mouse_click(Editor_state, Editor_state.left-4,Editor_state.top+5, 1)
   -- cursor moves to start of line
-  check_eq(Editor_state.cursor1.line, 1, 'F - test_click_to_left_of_line/cursor:line')
-  check_eq(Editor_state.cursor1.pos, 1, 'F - test_click_to_left_of_line/cursor:pos')
-  check_nil(Editor_state.selection1.line, 'F - test_click_to_left_of_line/selection is empty to avoid perturbing future edits')
+  check_eq(Editor_state.cursor1.line, 1, 'cursor:line')
+  check_eq(Editor_state.cursor1.pos, 1, 'cursor:pos')
+  check_nil(Editor_state.selection1.line, 'selection is empty to avoid perturbing future edits')
 end
 
 function test_click_takes_margins_into_account()
-  io.write('\ntest_click_takes_margins_into_account')
   -- display two lines with cursor on one of them
   App.screen.init{width=100, height=80}
   Editor_state = edit.initialize_test_state()
@@ -320,13 +296,12 @@ function test_click_takes_margins_into_account()
   edit.draw(Editor_state)
   edit.run_after_mouse_click(Editor_state, Editor_state.left+8,Editor_state.top+5, 1)
   -- cursor moves
-  check_eq(Editor_state.cursor1.line, 1, 'F - test_click_takes_margins_into_account/cursor:line')
-  check_eq(Editor_state.cursor1.pos, 2, 'F - test_click_takes_margins_into_account/cursor:pos')
-  check_nil(Editor_state.selection1.line, 'F - test_click_takes_margins_into_account/selection is empty to avoid perturbing future edits')
+  check_eq(Editor_state.cursor1.line, 1, 'cursor:line')
+  check_eq(Editor_state.cursor1.pos, 2, 'cursor:pos')
+  check_nil(Editor_state.selection1.line, 'selection is empty to avoid perturbing future edits')
 end
 
 function test_click_on_empty_line()
-  io.write('\ntest_click_on_empty_line')
   -- display two lines with the first one empty
   App.screen.init{width=50, height=80}
   Editor_state = edit.initialize_test_state()
@@ -339,11 +314,10 @@ function test_click_on_empty_line()
   edit.draw(Editor_state)
   edit.run_after_mouse_click(Editor_state, Editor_state.left+8,Editor_state.top+5, 1)
   -- cursor moves
-  check_eq(Editor_state.cursor1.line, 1, 'F - test_click_on_empty_line/cursor')
+  check_eq(Editor_state.cursor1.line, 1, 'cursor')
 end
 
 function test_draw_text()
-  io.write('\ntest_draw_text')
   App.screen.init{width=120, height=60}
   Editor_state = edit.initialize_test_state()
   Editor_state.lines = load_array{'abc', 'def', 'ghi'}
@@ -353,15 +327,14 @@ function test_draw_text()
   Editor_state.screen_bottom1 = {}
   edit.draw(Editor_state)
   local y = Editor_state.top
-  App.screen.check(y, 'abc', 'F - test_draw_text/screen:1')
+  App.screen.check(y, 'abc', 'screen:1')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'def', 'F - test_draw_text/screen:2')
+  App.screen.check(y, 'def', 'screen:2')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'ghi', 'F - test_draw_text/screen:3')
+  App.screen.check(y, 'ghi', 'screen:3')
 end
 
 function test_draw_wrapping_text()
-  io.write('\ntest_draw_wrapping_text')
   App.screen.init{width=50, height=60}
   Editor_state = edit.initialize_test_state()
   Editor_state.lines = load_array{'abc', 'defgh', 'xyz'}
@@ -371,15 +344,14 @@ function test_draw_wrapping_text()
   Editor_state.screen_bottom1 = {}
   edit.draw(Editor_state)
   local y = Editor_state.top
-  App.screen.check(y, 'abc', 'F - test_draw_wrapping_text/screen:1')
+  App.screen.check(y, 'abc', 'screen:1')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'de', 'F - test_draw_wrapping_text/screen:2')
+  App.screen.check(y, 'de', 'screen:2')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'fgh', 'F - test_draw_wrapping_text/screen:3')
+  App.screen.check(y, 'fgh', 'screen:3')
 end
 
 function test_draw_word_wrapping_text()
-  io.write('\ntest_draw_word_wrapping_text')
   App.screen.init{width=60, height=60}
   Editor_state = edit.initialize_test_state()
   Editor_state.lines = load_array{'abc def ghi', 'jkl'}
@@ -389,15 +361,14 @@ function test_draw_word_wrapping_text()
   Editor_state.screen_bottom1 = {}
   edit.draw(Editor_state)
   local y = Editor_state.top
-  App.screen.check(y, 'abc ', 'F - test_draw_word_wrapping_text/screen:1')
+  App.screen.check(y, 'abc ', 'screen:1')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'def ', 'F - test_draw_word_wrapping_text/screen:2')
+  App.screen.check(y, 'def ', 'screen:2')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'ghi', 'F - test_draw_word_wrapping_text/screen:3')
+  App.screen.check(y, 'ghi', 'screen:3')
 end
 
 function test_click_on_wrapping_line()
-  io.write('\ntest_click_on_wrapping_line')
   -- display two lines with cursor on one of them
   App.screen.init{width=50, height=80}
   Editor_state = edit.initialize_test_state()
@@ -410,13 +381,12 @@ function test_click_on_wrapping_line()
   edit.draw(Editor_state)
   edit.run_after_mouse_click(Editor_state, Editor_state.left+8,Editor_state.top+5, 1)
   -- cursor moves
-  check_eq(Editor_state.cursor1.line, 1, 'F - test_click_on_wrapping_line/cursor:line')
-  check_eq(Editor_state.cursor1.pos, 2, 'F - test_click_on_wrapping_line/cursor:pos')
-  check_nil(Editor_state.selection1.line, 'F - test_click_on_wrapping_line/selection is empty to avoid perturbing future edits')
+  check_eq(Editor_state.cursor1.line, 1, 'cursor:line')
+  check_eq(Editor_state.cursor1.pos, 2, 'cursor:pos')
+  check_nil(Editor_state.selection1.line, 'selection is empty to avoid perturbing future edits')
 end
 
 function test_click_on_wrapping_line_takes_margins_into_account()
-  io.write('\ntest_click_on_wrapping_line_takes_margins_into_account')
   -- display two lines with cursor on one of them
   App.screen.init{width=100, height=80}
   Editor_state = edit.initialize_test_state()
@@ -430,14 +400,13 @@ function test_click_on_wrapping_line_takes_margins_into_account()
   edit.draw(Editor_state)
   edit.run_after_mouse_click(Editor_state, Editor_state.left+8,Editor_state.top+5, 1)
   -- cursor moves
-  check_eq(Editor_state.cursor1.line, 1, 'F - test_click_on_wrapping_line_takes_margins_into_account/cursor:line')
-  check_eq(Editor_state.cursor1.pos, 2, 'F - test_click_on_wrapping_line_takes_margins_into_account/cursor:pos')
-  check_nil(Editor_state.selection1.line, 'F - test_click_on_wrapping_line_takes_margins_into_account/selection is empty to avoid perturbing future edits')
+  check_eq(Editor_state.cursor1.line, 1, 'cursor:line')
+  check_eq(Editor_state.cursor1.pos, 2, 'cursor:pos')
+  check_nil(Editor_state.selection1.line, 'selection is empty to avoid perturbing future edits')
 end
 
 function test_draw_text_wrapping_within_word()
   -- arrange a screen line that needs to be split within a word
-  io.write('\ntest_draw_text_wrapping_within_word')
   App.screen.init{width=60, height=60}
   Editor_state = edit.initialize_test_state()
   Editor_state.lines = load_array{'abcd e fghijk', 'xyz'}
@@ -447,16 +416,15 @@ function test_draw_text_wrapping_within_word()
   Editor_state.screen_bottom1 = {}
   edit.draw(Editor_state)
   local y = Editor_state.top
-  App.screen.check(y, 'abcd ', 'F - test_draw_text_wrapping_within_word/screen:1')
+  App.screen.check(y, 'abcd ', 'screen:1')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'e fgh', 'F - test_draw_text_wrapping_within_word/screen:2')
+  App.screen.check(y, 'e fgh', 'screen:2')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'ijk', 'F - test_draw_text_wrapping_within_word/screen:3')
+  App.screen.check(y, 'ijk', 'screen:3')
 end
 
 function test_draw_wrapping_text_containing_non_ascii()
   -- draw a long line containing non-ASCII
-  io.write('\ntest_draw_wrapping_text_containing_non_ascii')
   App.screen.init{width=60, height=60}
   Editor_state = edit.initialize_test_state()
   Editor_state.lines = load_array{'madam I’m adam', 'xyz'}  -- notice the non-ASCII apostrophe
@@ -466,15 +434,14 @@ function test_draw_wrapping_text_containing_non_ascii()
   Editor_state.screen_bottom1 = {}
   edit.draw(Editor_state)
   local y = Editor_state.top
-  App.screen.check(y, 'mad', 'F - test_draw_wrapping_text_containing_non_ascii/screen:1')
+  App.screen.check(y, 'mad', 'screen:1')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'am I', 'F - test_draw_wrapping_text_containing_non_ascii/screen:2')
+  App.screen.check(y, 'am I', 'screen:2')
   y = y + Editor_state.line_height
-  App.screen.check(y, '’m a', 'F - test_draw_wrapping_text_containing_non_ascii/screen:3')
+  App.screen.check(y, '’m a', 'screen:3')
 end
 
 function test_click_on_wrapping_line()
-  io.write('\ntest_click_on_wrapping_line')
   -- display a wrapping line
   App.screen.init{width=75, height=80}
   Editor_state = edit.initialize_test_state()
@@ -486,19 +453,18 @@ function test_click_on_wrapping_line()
   Editor_state.screen_bottom1 = {}
   edit.draw(Editor_state)
   local y = Editor_state.top
-  App.screen.check(y, 'madam ', 'F - test_click_on_wrapping_line/baseline/screen:1')
+  App.screen.check(y, 'madam ', 'baseline/screen:1')
   y = y + Editor_state.line_height
-  App.screen.check(y, "I'm ad", 'F - test_click_on_wrapping_line/baseline/screen:2')
+  App.screen.check(y, "I'm ad", 'baseline/screen:2')
   y = y + Editor_state.line_height
   -- click past end of second screen line
   edit.run_after_mouse_click(Editor_state, App.screen.width-2,y-2, 1)
   -- cursor moves to end of screen line
-  check_eq(Editor_state.cursor1.line, 1, 'F - test_click_on_wrapping_line/cursor:line')
-  check_eq(Editor_state.cursor1.pos, 12, 'F - test_click_on_wrapping_line/cursor:pos')
+  check_eq(Editor_state.cursor1.line, 1, 'cursor:line')
+  check_eq(Editor_state.cursor1.pos, 12, 'cursor:pos')
 end
 
 function test_click_on_wrapping_line_rendered_from_partway_at_top_of_screen()
-  io.write('\ntest_click_on_wrapping_line_rendered_from_partway_at_top_of_screen')
   -- display a wrapping line from its second screen line
   App.screen.init{width=75, height=80}
   Editor_state = edit.initialize_test_state()
@@ -510,17 +476,16 @@ function test_click_on_wrapping_line_rendered_from_partway_at_top_of_screen()
   Editor_state.screen_bottom1 = {}
   edit.draw(Editor_state)
   local y = Editor_state.top
-  App.screen.check(y, "I'm ad", 'F - test_click_on_wrapping_line_rendered_from_partway_at_top_of_screen/baseline/screen:2')
+  App.screen.check(y, "I'm ad", 'baseline/screen:2')
   y = y + Editor_state.line_height
   -- click past end of second screen line
   edit.run_after_mouse_click(Editor_state, App.screen.width-2,y-2, 1)
   -- cursor moves to end of screen line
-  check_eq(Editor_state.cursor1.line, 1, 'F - test_click_on_wrapping_line_rendered_from_partway_at_top_of_screen/cursor:line')
-  check_eq(Editor_state.cursor1.pos, 12, 'F - test_click_on_wrapping_line_rendered_from_partway_at_top_of_screen/cursor:pos')
+  check_eq(Editor_state.cursor1.line, 1, 'cursor:line')
+  check_eq(Editor_state.cursor1.pos, 12, 'cursor:pos')
 end
 
 function test_click_past_end_of_wrapping_line()
-  io.write('\ntest_click_past_end_of_wrapping_line')
   -- display a wrapping line
   App.screen.init{width=75, height=80}
   Editor_state = edit.initialize_test_state()
@@ -532,20 +497,19 @@ function test_click_past_end_of_wrapping_line()
   Editor_state.screen_bottom1 = {}
   edit.draw(Editor_state)
   local y = Editor_state.top
-  App.screen.check(y, 'madam ', 'F - test_click_past_end_of_wrapping_line/baseline/screen:1')
+  App.screen.check(y, 'madam ', 'baseline/screen:1')
   y = y + Editor_state.line_height
-  App.screen.check(y, "I'm ad", 'F - test_click_past_end_of_wrapping_line/baseline/screen:2')
+  App.screen.check(y, "I'm ad", 'baseline/screen:2')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'am', 'F - test_click_past_end_of_wrapping_line/baseline/screen:3')
+  App.screen.check(y, 'am', 'baseline/screen:3')
   y = y + Editor_state.line_height
   -- click past the end of it
   edit.run_after_mouse_click(Editor_state, App.screen.width-2,y-2, 1)
   -- cursor moves to end of line
-  check_eq(Editor_state.cursor1.pos, 15, 'F - test_click_past_end_of_wrapping_line/cursor')  -- one more than the number of UTF-8 code-points
+  check_eq(Editor_state.cursor1.pos, 15, 'cursor')  -- one more than the number of UTF-8 code-points
 end
 
 function test_click_past_end_of_wrapping_line_containing_non_ascii()
-  io.write('\ntest_click_past_end_of_wrapping_line_containing_non_ascii')
   -- display a wrapping line containing non-ASCII
   App.screen.init{width=75, height=80}
   Editor_state = edit.initialize_test_state()
@@ -557,20 +521,19 @@ function test_click_past_end_of_wrapping_line_containing_non_ascii()
   Editor_state.screen_bottom1 = {}
   edit.draw(Editor_state)
   local y = Editor_state.top
-  App.screen.check(y, 'madam ', 'F - test_click_past_end_of_wrapping_line_containing_non_ascii/baseline/screen:1')
+  App.screen.check(y, 'madam ', 'baseline/screen:1')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'I’m ad', 'F - test_click_past_end_of_wrapping_line_containing_non_ascii/baseline/screen:2')
+  App.screen.check(y, 'I’m ad', 'baseline/screen:2')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'am', 'F - test_click_past_end_of_wrapping_line_containing_non_ascii/baseline/screen:3')
+  App.screen.check(y, 'am', 'baseline/screen:3')
   y = y + Editor_state.line_height
   -- click past the end of it
   edit.run_after_mouse_click(Editor_state, App.screen.width-2,y-2, 1)
   -- cursor moves to end of line
-  check_eq(Editor_state.cursor1.pos, 15, 'F - test_click_past_end_of_wrapping_line_containing_non_ascii/cursor')  -- one more than the number of UTF-8 code-points
+  check_eq(Editor_state.cursor1.pos, 15, 'cursor')  -- one more than the number of UTF-8 code-points
 end
 
 function test_click_past_end_of_word_wrapping_line()
-  io.write('\ntest_click_past_end_of_word_wrapping_line')
   -- display a long line wrapping at a word boundary on a screen of more realistic length
   App.screen.init{width=160, height=80}
   Editor_state = edit.initialize_test_state()
@@ -583,16 +546,15 @@ function test_click_past_end_of_word_wrapping_line()
   Editor_state.screen_bottom1 = {}
   edit.draw(Editor_state)
   local y = Editor_state.top
-  App.screen.check(y, 'the quick brown fox ', 'F - test_click_past_end_of_word_wrapping_line/baseline/screen:1')
+  App.screen.check(y, 'the quick brown fox ', 'baseline/screen:1')
   y = y + Editor_state.line_height
   -- click past the end of the screen line
   edit.run_after_mouse_click(Editor_state, App.screen.width-2,y-2, 1)
   -- cursor moves to end of screen line
-  check_eq(Editor_state.cursor1.pos, 20, 'F - test_click_past_end_of_word_wrapping_line/cursor')
+  check_eq(Editor_state.cursor1.pos, 20, 'cursor')
 end
 
 function test_select_text()
-  io.write('\ntest_select_text')
   -- display a line of text
   App.screen.init{width=75, height=80}
   Editor_state = edit.initialize_test_state()
@@ -608,14 +570,13 @@ function test_select_text()
   App.fake_key_release('lshift')
   edit.key_release(Editor_state, 'lshift')
   -- selection persists even after shift is released
-  check_eq(Editor_state.selection1.line, 1, 'F - test_select_text/selection:line')
-  check_eq(Editor_state.selection1.pos, 1, 'F - test_select_text/selection:pos')
-  check_eq(Editor_state.cursor1.line, 1, 'F - test_select_text/cursor:line')
-  check_eq(Editor_state.cursor1.pos, 2, 'F - test_select_text/cursor:pos')
+  check_eq(Editor_state.selection1.line, 1, 'selection:line')
+  check_eq(Editor_state.selection1.pos, 1, 'selection:pos')
+  check_eq(Editor_state.cursor1.line, 1, 'cursor:line')
+  check_eq(Editor_state.cursor1.pos, 2, 'cursor:pos')
 end
 
 function test_cursor_movement_without_shift_resets_selection()
-  io.write('\ntest_cursor_movement_without_shift_resets_selection')
   -- display a line of text with some part selected
   App.screen.init{width=75, height=80}
   Editor_state = edit.initialize_test_state()
@@ -629,12 +590,11 @@ function test_cursor_movement_without_shift_resets_selection()
   -- press an arrow key without shift
   edit.run_after_keychord(Editor_state, 'right')
   -- no change to data, selection is reset
-  check_nil(Editor_state.selection1.line, 'F - test_cursor_movement_without_shift_resets_selection')
-  check_eq(Editor_state.lines[1].data, 'abc', 'F - test_cursor_movement_without_shift_resets_selection/data')
+  check_nil(Editor_state.selection1.line, 'check')
+  check_eq(Editor_state.lines[1].data, 'abc', 'data')
 end
 
 function test_edit_deletes_selection()
-  io.write('\ntest_edit_deletes_selection')
   -- display a line of text with some part selected
   App.screen.init{width=75, height=80}
   Editor_state = edit.initialize_test_state()
@@ -648,11 +608,10 @@ function test_edit_deletes_selection()
   -- press a key
   edit.run_after_text_input(Editor_state, 'x')
   -- selected text is deleted and replaced with the key
-  check_eq(Editor_state.lines[1].data, 'xbc', 'F - test_edit_deletes_selection')
+  check_eq(Editor_state.lines[1].data, 'xbc', 'check')
 end
 
 function test_edit_with_shift_key_deletes_selection()
-  io.write('\ntest_edit_with_shift_key_deletes_selection')
   -- display a line of text with some part selected
   App.screen.init{width=75, height=80}
   Editor_state = edit.initialize_test_state()
@@ -670,12 +629,11 @@ function test_edit_with_shift_key_deletes_selection()
   edit.key_release(Editor_state, 'd')
   App.fake_key_release('lshift')
   -- selected text is deleted and replaced with the key
-  check_nil(Editor_state.selection1.line, 'F - test_edit_with_shift_key_deletes_selection')
-  check_eq(Editor_state.lines[1].data, 'Dbc', 'F - test_edit_with_shift_key_deletes_selection/data')
+  check_nil(Editor_state.selection1.line, 'check')
+  check_eq(Editor_state.lines[1].data, 'Dbc', 'data')
 end
 
 function test_copy_does_not_reset_selection()
-  io.write('\ntest_copy_does_not_reset_selection')
   -- display a line of text with a selection
   App.screen.init{width=75, height=80}
   Editor_state = edit.initialize_test_state()
@@ -688,13 +646,12 @@ function test_copy_does_not_reset_selection()
   edit.draw(Editor_state)
   -- copy selection
   edit.run_after_keychord(Editor_state, 'C-c')
-  check_eq(App.clipboard, 'a', 'F - test_copy_does_not_reset_selection/clipboard')
+  check_eq(App.clipboard, 'a', 'clipboard')
   -- selection is reset since shift key is not pressed
-  check(Editor_state.selection1.line, 'F - test_copy_does_not_reset_selection')
+  check(Editor_state.selection1.line, 'check')
 end
 
 function test_cut()
-  io.write('\ntest_cut')
   -- display a line of text with some part selected
   App.screen.init{width=75, height=80}
   Editor_state = edit.initialize_test_state()
@@ -707,13 +664,12 @@ function test_cut()
   edit.draw(Editor_state)
   -- press a key
   edit.run_after_keychord(Editor_state, 'C-x')
-  check_eq(App.clipboard, 'a', 'F - test_cut/clipboard')
+  check_eq(App.clipboard, 'a', 'clipboard')
   -- selected text is deleted
-  check_eq(Editor_state.lines[1].data, 'bc', 'F - test_cut/data')
+  check_eq(Editor_state.lines[1].data, 'bc', 'data')
 end
 
 function test_paste_replaces_selection()
-  io.write('\ntest_paste_replaces_selection')
   -- display a line of text with a selection
   App.screen.init{width=75, height=80}
   Editor_state = edit.initialize_test_state()
@@ -730,11 +686,10 @@ function test_paste_replaces_selection()
   edit.run_after_keychord(Editor_state, 'C-v')
   -- selection is reset since shift key is not pressed
   -- selection includes the newline, so it's also deleted
-  check_eq(Editor_state.lines[1].data, 'xyzdef', 'F - test_paste_replaces_selection')
+  check_eq(Editor_state.lines[1].data, 'xyzdef', 'check')
 end
 
 function test_deleting_selection_may_scroll()
-  io.write('\ntest_deleting_selection_may_scroll')
   -- display lines 2/3/4
   App.screen.init{width=120, height=60}
   Editor_state = edit.initialize_test_state()
@@ -745,22 +700,21 @@ function test_deleting_selection_may_scroll()
   Editor_state.screen_bottom1 = {}
   edit.draw(Editor_state)
   local y = Editor_state.top
-  App.screen.check(y, 'def', 'F - test_deleting_selection_may_scroll/baseline/screen:1')
+  App.screen.check(y, 'def', 'baseline/screen:1')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'ghi', 'F - test_deleting_selection_may_scroll/baseline/screen:2')
+  App.screen.check(y, 'ghi', 'baseline/screen:2')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'jkl', 'F - test_deleting_selection_may_scroll/baseline/screen:3')
+  App.screen.check(y, 'jkl', 'baseline/screen:3')
   -- set up a selection starting above the currently displayed page
   Editor_state.selection1 = {line=1, pos=2}
   -- delete selection
   edit.run_after_keychord(Editor_state, 'backspace')
   -- page scrolls up
-  check_eq(Editor_state.screen_top1.line, 1, 'F - test_deleting_selection_may_scroll')
-  check_eq(Editor_state.lines[1].data, 'ahi', 'F - test_deleting_selection_may_scroll/data')
+  check_eq(Editor_state.screen_top1.line, 1, 'check')
+  check_eq(Editor_state.lines[1].data, 'ahi', 'data')
 end
 
 function test_edit_wrapping_text()
-  io.write('\ntest_edit_wrapping_text')
   App.screen.init{width=50, height=60}
   Editor_state = edit.initialize_test_state()
   Editor_state.lines = load_array{'abc', 'def', 'xyz'}
@@ -771,15 +725,14 @@ function test_edit_wrapping_text()
   edit.draw(Editor_state)
   edit.run_after_text_input(Editor_state, 'g')
   local y = Editor_state.top
-  App.screen.check(y, 'abc', 'F - test_edit_wrapping_text/screen:1')
+  App.screen.check(y, 'abc', 'screen:1')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'de', 'F - test_edit_wrapping_text/screen:2')
+  App.screen.check(y, 'de', 'screen:2')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'fg', 'F - test_edit_wrapping_text/screen:3')
+  App.screen.check(y, 'fg', 'screen:3')
 end
 
 function test_insert_newline()
-  io.write('\ntest_insert_newline')
   -- display a few lines
   App.screen.init{width=Editor_state.left+30, height=60}
   Editor_state = edit.initialize_test_state()
@@ -790,26 +743,25 @@ function test_insert_newline()
   Editor_state.screen_bottom1 = {}
   edit.draw(Editor_state)
   local y = Editor_state.top
-  App.screen.check(y, 'abc', 'F - test_insert_newline/baseline/screen:1')
+  App.screen.check(y, 'abc', 'baseline/screen:1')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'def', 'F - test_insert_newline/baseline/screen:2')
+  App.screen.check(y, 'def', 'baseline/screen:2')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'ghi', 'F - test_insert_newline/baseline/screen:3')
+  App.screen.check(y, 'ghi', 'baseline/screen:3')
   -- hitting the enter key splits the line
   edit.run_after_keychord(Editor_state, 'return')
-  check_eq(Editor_state.screen_top1.line, 1, 'F - test_insert_newline/screen_top')
-  check_eq(Editor_state.cursor1.line, 2, 'F - test_insert_newline/cursor:line')
-  check_eq(Editor_state.cursor1.pos, 1, 'F - test_insert_newline/cursor:pos')
+  check_eq(Editor_state.screen_top1.line, 1, 'screen_top')
+  check_eq(Editor_state.cursor1.line, 2, 'cursor:line')
+  check_eq(Editor_state.cursor1.pos, 1, 'cursor:pos')
   y = Editor_state.top
-  App.screen.check(y, 'a', 'F - test_insert_newline/screen:1')
+  App.screen.check(y, 'a', 'screen:1')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'bc', 'F - test_insert_newline/screen:2')
+  App.screen.check(y, 'bc', 'screen:2')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'def', 'F - test_insert_newline/screen:3')
+  App.screen.check(y, 'def', 'screen:3')
 end
 
 function test_insert_newline_at_start_of_line()
-  io.write('\ntest_insert_newline_at_start_of_line')
   -- display a line
   App.screen.init{width=Editor_state.left+30, height=60}
   Editor_state = edit.initialize_test_state()
@@ -820,14 +772,13 @@ function test_insert_newline_at_start_of_line()
   Editor_state.screen_bottom1 = {}
   -- hitting the enter key splits the line
   edit.run_after_keychord(Editor_state, 'return')
-  check_eq(Editor_state.cursor1.line, 2, 'F - test_insert_newline_at_start_of_line/cursor:line')
-  check_eq(Editor_state.cursor1.pos, 1, 'F - test_insert_newline_at_start_of_line/cursor:pos')
-  check_eq(Editor_state.lines[1].data, '', 'F - test_insert_newline_at_start_of_line/data:1')
-  check_eq(Editor_state.lines[2].data, 'abc', 'F - test_insert_newline_at_start_of_line/data:2')
+  check_eq(Editor_state.cursor1.line, 2, 'cursor:line')
+  check_eq(Editor_state.cursor1.pos, 1, 'cursor:pos')
+  check_eq(Editor_state.lines[1].data, '', 'data:1')
+  check_eq(Editor_state.lines[2].data, 'abc', 'data:2')
 end
 
 function test_insert_from_clipboard()
-  io.write('\ntest_insert_from_clipboard')
   -- display a few lines
   App.screen.init{width=Editor_state.left+30, height=60}
   Editor_state = edit.initialize_test_state()
@@ -838,27 +789,26 @@ function test_insert_from_clipboard()
   Editor_state.screen_bottom1 = {}
   edit.draw(Editor_state)
   local y = Editor_state.top
-  App.screen.check(y, 'abc', 'F - test_insert_from_clipboard/baseline/screen:1')
+  App.screen.check(y, 'abc', 'baseline/screen:1')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'def', 'F - test_insert_from_clipboard/baseline/screen:2')
+  App.screen.check(y, 'def', 'baseline/screen:2')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'ghi', 'F - test_insert_from_clipboard/baseline/screen:3')
+  App.screen.check(y, 'ghi', 'baseline/screen:3')
   -- paste some text including a newline, check that new line is created
   App.clipboard = 'xy\nz'
   edit.run_after_keychord(Editor_state, 'C-v')
-  check_eq(Editor_state.screen_top1.line, 1, 'F - test_insert_from_clipboard/screen_top')
-  check_eq(Editor_state.cursor1.line, 2, 'F - test_insert_from_clipboard/cursor:line')
-  check_eq(Editor_state.cursor1.pos, 2, 'F - test_insert_from_clipboard/cursor:pos')
+  check_eq(Editor_state.screen_top1.line, 1, 'screen_top')
+  check_eq(Editor_state.cursor1.line, 2, 'cursor:line')
+  check_eq(Editor_state.cursor1.pos, 2, 'cursor:pos')
   y = Editor_state.top
-  App.screen.check(y, 'axy', 'F - test_insert_from_clipboard/screen:1')
+  App.screen.check(y, 'axy', 'screen:1')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'zbc', 'F - test_insert_from_clipboard/screen:2')
+  App.screen.check(y, 'zbc', 'screen:2')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'def', 'F - test_insert_from_clipboard/screen:3')
+  App.screen.check(y, 'def', 'screen:3')
 end
 
 function test_select_text_using_mouse()
-  io.write('\ntest_select_text_using_mouse')
   App.screen.init{width=50, height=60}
   Editor_state = edit.initialize_test_state()
   Editor_state.lines = load_array{'abc', 'def', 'xyz'}
@@ -872,14 +822,13 @@ function test_select_text_using_mouse()
   edit.run_after_mouse_press(Editor_state, Editor_state.left+8,Editor_state.top+5, 1)
   -- drag and release somewhere else
   edit.run_after_mouse_release(Editor_state, Editor_state.left+20,Editor_state.top+Editor_state.line_height+5, 1)
-  check_eq(Editor_state.selection1.line, 1, 'F - test_select_text_using_mouse/selection:line')
-  check_eq(Editor_state.selection1.pos, 2, 'F - test_select_text_using_mouse/selection:pos')
-  check_eq(Editor_state.cursor1.line, 2, 'F - test_select_text_using_mouse/cursor:line')
-  check_eq(Editor_state.cursor1.pos, 4, 'F - test_select_text_using_mouse/cursor:pos')
+  check_eq(Editor_state.selection1.line, 1, 'selection:line')
+  check_eq(Editor_state.selection1.pos, 2, 'selection:pos')
+  check_eq(Editor_state.cursor1.line, 2, 'cursor:line')
+  check_eq(Editor_state.cursor1.pos, 4, 'cursor:pos')
 end
 
 function test_select_text_using_mouse_and_shift()
-  io.write('\ntest_select_text_using_mouse_and_shift')
   App.screen.init{width=50, height=60}
   Editor_state = edit.initialize_test_state()
   Editor_state.lines = load_array{'abc', 'def', 'xyz'}
@@ -897,14 +846,13 @@ function test_select_text_using_mouse_and_shift()
   edit.run_after_mouse_press(Editor_state, Editor_state.left+20,Editor_state.top+5, 1)
   edit.run_after_mouse_release(Editor_state, Editor_state.left+20,Editor_state.top+Editor_state.line_height+5, 1)
   App.fake_key_release('lshift')
-  check_eq(Editor_state.selection1.line, 1, 'F - test_select_text_using_mouse_and_shift/selection:line')
-  check_eq(Editor_state.selection1.pos, 2, 'F - test_select_text_using_mouse_and_shift/selection:pos')
-  check_eq(Editor_state.cursor1.line, 2, 'F - test_select_text_using_mouse_and_shift/cursor:line')
-  check_eq(Editor_state.cursor1.pos, 4, 'F - test_select_text_using_mouse_and_shift/cursor:pos')
+  check_eq(Editor_state.selection1.line, 1, 'selection:line')
+  check_eq(Editor_state.selection1.pos, 2, 'selection:pos')
+  check_eq(Editor_state.cursor1.line, 2, 'cursor:line')
+  check_eq(Editor_state.cursor1.pos, 4, 'cursor:pos')
 end
 
 function test_select_text_repeatedly_using_mouse_and_shift()
-  io.write('\ntest_select_text_repeatedly_using_mouse_and_shift')
   App.screen.init{width=50, height=60}
   Editor_state = edit.initialize_test_state()
   Editor_state.lines = load_array{'abc', 'def', 'xyz'}
@@ -928,14 +876,13 @@ function test_select_text_repeatedly_using_mouse_and_shift()
   edit.run_after_mouse_release(Editor_state, Editor_state.left+8,Editor_state.top+Editor_state.line_height+5, 1)
   App.fake_key_release('lshift')
   -- selection is between first and third location. forget the second location, not the first.
-  check_eq(Editor_state.selection1.line, 1, 'F - test_select_text_repeatedly_using_mouse_and_shift/selection:line')
-  check_eq(Editor_state.selection1.pos, 2, 'F - test_select_text_repeatedly_using_mouse_and_shift/selection:pos')
-  check_eq(Editor_state.cursor1.line, 2, 'F - test_select_text_repeatedly_using_mouse_and_shift/cursor:line')
-  check_eq(Editor_state.cursor1.pos, 2, 'F - test_select_text_repeatedly_using_mouse_and_shift/cursor:pos')
+  check_eq(Editor_state.selection1.line, 1, 'selection:line')
+  check_eq(Editor_state.selection1.pos, 2, 'selection:pos')
+  check_eq(Editor_state.cursor1.line, 2, 'cursor:line')
+  check_eq(Editor_state.cursor1.pos, 2, 'cursor:pos')
 end
 
 function test_cut_without_selection()
-  io.write('\ntest_cut_without_selection')
   -- display a few lines
   App.screen.init{width=Editor_state.left+30, height=60}
   Editor_state = edit.initialize_test_state()
@@ -949,11 +896,10 @@ function test_cut_without_selection()
   -- try to cut without selecting text
   edit.run_after_keychord(Editor_state, 'C-x')
   -- no crash
-  check_nil(Editor_state.selection1.line, 'F - test_cut_without_selection')
+  check_nil(Editor_state.selection1.line, 'check')
 end
 
 function test_pagedown()
-  io.write('\ntest_pagedown')
   App.screen.init{width=120, height=45}
   Editor_state = edit.initialize_test_state()
   Editor_state.lines = load_array{'abc', 'def', 'ghi'}
@@ -964,21 +910,20 @@ function test_pagedown()
   -- initially the first two lines are displayed
   edit.draw(Editor_state)
   local y = Editor_state.top
-  App.screen.check(y, 'abc', 'F - test_pagedown/baseline/screen:1')
+  App.screen.check(y, 'abc', 'baseline/screen:1')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'def', 'F - test_pagedown/baseline/screen:2')
+  App.screen.check(y, 'def', 'baseline/screen:2')
   -- after pagedown the bottom line becomes the top
   edit.run_after_keychord(Editor_state, 'pagedown')
-  check_eq(Editor_state.screen_top1.line, 2, 'F - test_pagedown/screen_top')
-  check_eq(Editor_state.cursor1.line, 2, 'F - test_pagedown/cursor')
+  check_eq(Editor_state.screen_top1.line, 2, 'screen_top')
+  check_eq(Editor_state.cursor1.line, 2, 'cursor')
   y = Editor_state.top
-  App.screen.check(y, 'def', 'F - test_pagedown/screen:1')
+  App.screen.check(y, 'def', 'screen:1')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'ghi', 'F - test_pagedown/screen:2')
+  App.screen.check(y, 'ghi', 'screen:2')
 end
 
 function test_pagedown_skips_drawings()
-  io.write('\ntest_pagedown_skips_drawings')
   -- some lines of text with a drawing intermixed
   local drawing_width = 50
   App.screen.init{width=Editor_state.left+drawing_width, height=80}
@@ -988,7 +933,7 @@ function test_pagedown_skips_drawings()
                                   'def',               -- height 15
                                   'ghi'}               -- height 15
   Text.redraw_all(Editor_state)
-  check_eq(Editor_state.lines[2].mode, 'drawing', 'F - test_pagedown_skips_drawings/baseline/lines')
+  check_eq(Editor_state.lines[2].mode, 'drawing', 'baseline/lines')
   Editor_state.cursor1 = {line=1, pos=1}
   Editor_state.screen_top1 = {line=1, pos=1}
   Editor_state.screen_bottom1 = {}
@@ -997,18 +942,17 @@ function test_pagedown_skips_drawings()
   -- 15px margin + 15px line1 + 10px margin + 25px drawing + 10px margin = 75px < screen height 80px
   edit.draw(Editor_state)
   local y = Editor_state.top
-  App.screen.check(y, 'abc', 'F - test_pagedown_skips_drawings/baseline/screen:1')
+  App.screen.check(y, 'abc', 'baseline/screen:1')
   -- after pagedown the screen draws the drawing up top
   -- 15px margin + 10px margin + 25px drawing + 10px margin + 15px line3 = 75px < screen height 80px
   edit.run_after_keychord(Editor_state, 'pagedown')
-  check_eq(Editor_state.screen_top1.line, 2, 'F - test_pagedown_skips_drawings/screen_top')
-  check_eq(Editor_state.cursor1.line, 3, 'F - test_pagedown_skips_drawings/cursor')
+  check_eq(Editor_state.screen_top1.line, 2, 'screen_top')
+  check_eq(Editor_state.cursor1.line, 3, 'cursor')
   y = Editor_state.top + drawing_height
-  App.screen.check(y, 'def', 'F - test_pagedown_skips_drawings/screen:1')
+  App.screen.check(y, 'def', 'screen:1')
 end
 
 function test_pagedown_often_shows_start_of_wrapping_line()
-  io.write('\ntest_pagedown_often_shows_start_of_wrapping_line')
   -- draw a few lines ending in part of a wrapping line
   App.screen.init{width=50, height=60}
   Editor_state = edit.initialize_test_state()
@@ -1019,27 +963,26 @@ function test_pagedown_often_shows_start_of_wrapping_line()
   Editor_state.screen_bottom1 = {}
   edit.draw(Editor_state)
   local y = Editor_state.top
-  App.screen.check(y, 'abc', 'F - test_pagedown_often_shows_start_of_wrapping_line/baseline/screen:1')
+  App.screen.check(y, 'abc', 'baseline/screen:1')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'def ', 'F - test_pagedown_often_shows_start_of_wrapping_line/baseline/screen:2')
+  App.screen.check(y, 'def ', 'baseline/screen:2')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'ghi ', 'F - test_pagedown_often_shows_start_of_wrapping_line/baseline/screen:3')
+  App.screen.check(y, 'ghi ', 'baseline/screen:3')
   -- after pagedown we start drawing from the bottom _line_ (multiple screen lines)
   edit.run_after_keychord(Editor_state, 'pagedown')
-  check_eq(Editor_state.screen_top1.line, 2, 'F - test_pagedown_often_shows_start_of_wrapping_line/screen_top:line')
-  check_eq(Editor_state.screen_top1.pos, 1, 'F - test_pagedown_often_shows_start_of_wrapping_line/screen_top:pos')
-  check_eq(Editor_state.cursor1.line, 2, 'F - test_pagedown_often_shows_start_of_wrapping_line/cursor:line')
-  check_eq(Editor_state.cursor1.pos, 1, 'F - test_pagedown_often_shows_start_of_wrapping_line/cursor:pos')
+  check_eq(Editor_state.screen_top1.line, 2, 'screen_top:line')
+  check_eq(Editor_state.screen_top1.pos, 1, 'screen_top:pos')
+  check_eq(Editor_state.cursor1.line, 2, 'cursor:line')
+  check_eq(Editor_state.cursor1.pos, 1, 'cursor:pos')
   y = Editor_state.top
-  App.screen.check(y, 'def ', 'F - test_pagedown_often_shows_start_of_wrapping_line/screen:1')
+  App.screen.check(y, 'def ', 'screen:1')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'ghi ', 'F - test_pagedown_often_shows_start_of_wrapping_line/screen:2')
+  App.screen.check(y, 'ghi ', 'screen:2')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'jkl', 'F - test_pagedown_often_shows_start_of_wrapping_line/screen:3')
+  App.screen.check(y, 'jkl', 'screen:3')
 end
 
 function test_pagedown_can_start_from_middle_of_long_wrapping_line()
-  io.write('\ntest_pagedown_can_start_from_middle_of_long_wrapping_line')
   -- draw a few lines starting from a very long wrapping line
   App.screen.init{width=Editor_state.left+30, height=60}
   Editor_state = edit.initialize_test_state()
@@ -1050,25 +993,24 @@ function test_pagedown_can_start_from_middle_of_long_wrapping_line()
   Editor_state.screen_bottom1 = {}
   edit.draw(Editor_state)
   local y = Editor_state.top
-  App.screen.check(y, 'abc ', 'F - test_pagedown_can_start_from_middle_of_long_wrapping_line/baseline/screen:1')
+  App.screen.check(y, 'abc ', 'baseline/screen:1')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'def ', 'F - test_pagedown_can_start_from_middle_of_long_wrapping_line/baseline/screen:2')
+  App.screen.check(y, 'def ', 'baseline/screen:2')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'ghi ', 'F - test_pagedown_can_start_from_middle_of_long_wrapping_line/baseline/screen:3')
+  App.screen.check(y, 'ghi ', 'baseline/screen:3')
   -- after pagedown we scroll down the very long wrapping line
   edit.run_after_keychord(Editor_state, 'pagedown')
-  check_eq(Editor_state.screen_top1.line, 1, 'F - test_pagedown_can_start_from_middle_of_long_wrapping_line/screen_top:line')
-  check_eq(Editor_state.screen_top1.pos, 9, 'F - test_pagedown_can_start_from_middle_of_long_wrapping_line/screen_top:pos')
+  check_eq(Editor_state.screen_top1.line, 1, 'screen_top:line')
+  check_eq(Editor_state.screen_top1.pos, 9, 'screen_top:pos')
   y = Editor_state.top
-  App.screen.check(y, 'ghi ', 'F - test_pagedown_can_start_from_middle_of_long_wrapping_line/screen:1')
+  App.screen.check(y, 'ghi ', 'screen:1')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'jkl ', 'F - test_pagedown_can_start_from_middle_of_long_wrapping_line/screen:2')
+  App.screen.check(y, 'jkl ', 'screen:2')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'mno ', 'F - test_pagedown_can_start_from_middle_of_long_wrapping_line/screen:3')
+  App.screen.check(y, 'mno ', 'screen:3')
 end
 
 function test_pagedown_never_moves_up()
-  io.write('\ntest_pagedown_never_moves_up')
   -- draw the final screen line of a wrapping line
   App.screen.init{width=Editor_state.left+30, height=60}
   Editor_state = edit.initialize_test_state()
@@ -1080,12 +1022,11 @@ function test_pagedown_never_moves_up()
   edit.draw(Editor_state)
   -- pagedown makes no change
   edit.run_after_keychord(Editor_state, 'pagedown')
-  check_eq(Editor_state.screen_top1.line, 1, 'F - test_pagedown_never_moves_up/screen_top:line')
-  check_eq(Editor_state.screen_top1.pos, 9, 'F - test_pagedown_never_moves_up/screen_top:pos')
+  check_eq(Editor_state.screen_top1.line, 1, 'screen_top:line')
+  check_eq(Editor_state.screen_top1.pos, 9, 'screen_top:pos')
 end
 
 function test_down_arrow_moves_cursor()
-  io.write('\ntest_down_arrow_moves_cursor')
   App.screen.init{width=120, height=60}
   Editor_state = edit.initialize_test_state()
   Editor_state.lines = load_array{'abc', 'def', 'ghi', 'jkl'}
@@ -1096,26 +1037,25 @@ function test_down_arrow_moves_cursor()
   -- initially the first three lines are displayed
   edit.draw(Editor_state)
   local y = Editor_state.top
-  App.screen.check(y, 'abc', 'F - test_down_arrow_moves_cursor/baseline/screen:1')
+  App.screen.check(y, 'abc', 'baseline/screen:1')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'def', 'F - test_down_arrow_moves_cursor/baseline/screen:2')
+  App.screen.check(y, 'def', 'baseline/screen:2')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'ghi', 'F - test_down_arrow_moves_cursor/baseline/screen:3')
+  App.screen.check(y, 'ghi', 'baseline/screen:3')
   -- after hitting the down arrow, the cursor moves down by 1 line
   edit.run_after_keychord(Editor_state, 'down')
-  check_eq(Editor_state.screen_top1.line, 1, 'F - test_down_arrow_moves_cursor/screen_top')
-  check_eq(Editor_state.cursor1.line, 2, 'F - test_down_arrow_moves_cursor/cursor')
+  check_eq(Editor_state.screen_top1.line, 1, 'screen_top')
+  check_eq(Editor_state.cursor1.line, 2, 'cursor')
   -- the screen is unchanged
   y = Editor_state.top
-  App.screen.check(y, 'abc', 'F - test_down_arrow_moves_cursor/screen:1')
+  App.screen.check(y, 'abc', 'screen:1')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'def', 'F - test_down_arrow_moves_cursor/screen:2')
+  App.screen.check(y, 'def', 'screen:2')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'ghi', 'F - test_down_arrow_moves_cursor/screen:3')
+  App.screen.check(y, 'ghi', 'screen:3')
 end
 
 function test_down_arrow_scrolls_down_by_one_line()
-  io.write('\ntest_down_arrow_scrolls_down_by_one_line')
   -- display the first three lines with the cursor on the bottom line
   App.screen.init{width=120, height=60}
   Editor_state = edit.initialize_test_state()
@@ -1126,25 +1066,24 @@ function test_down_arrow_scrolls_down_by_one_line()
   Editor_state.screen_bottom1 = {}
   edit.draw(Editor_state)
   local y = Editor_state.top
-  App.screen.check(y, 'abc', 'F - test_down_arrow_scrolls_down_by_one_line/baseline/screen:1')
+  App.screen.check(y, 'abc', 'baseline/screen:1')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'def', 'F - test_down_arrow_scrolls_down_by_one_line/baseline/screen:2')
+  App.screen.check(y, 'def', 'baseline/screen:2')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'ghi', 'F - test_down_arrow_scrolls_down_by_one_line/baseline/screen:3')
+  App.screen.check(y, 'ghi', 'baseline/screen:3')
   -- after hitting the down arrow the screen scrolls down by one line
   edit.run_after_keychord(Editor_state, 'down')
-  check_eq(Editor_state.screen_top1.line, 2, 'F - test_down_arrow_scrolls_down_by_one_line/screen_top')
-  check_eq(Editor_state.cursor1.line, 4, 'F - test_down_arrow_scrolls_down_by_one_line/cursor')
+  check_eq(Editor_state.screen_top1.line, 2, 'screen_top')
+  check_eq(Editor_state.cursor1.line, 4, 'cursor')
   y = Editor_state.top
-  App.screen.check(y, 'def', 'F - test_down_arrow_scrolls_down_by_one_line/screen:1')
+  App.screen.check(y, 'def', 'screen:1')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'ghi', 'F - test_down_arrow_scrolls_down_by_one_line/screen:2')
+  App.screen.check(y, 'ghi', 'screen:2')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'jkl', 'F - test_down_arrow_scrolls_down_by_one_line/screen:3')
+  App.screen.check(y, 'jkl', 'screen:3')
 end
 
 function test_down_arrow_scrolls_down_by_one_screen_line()
-  io.write('\ntest_down_arrow_scrolls_down_by_one_screen_line')
   -- display the first three lines with the cursor on the bottom line
   App.screen.init{width=Editor_state.left+30, height=60}
   Editor_state = edit.initialize_test_state()
@@ -1155,26 +1094,25 @@ function test_down_arrow_scrolls_down_by_one_screen_line()
   Editor_state.screen_bottom1 = {}
   edit.draw(Editor_state)
   local y = Editor_state.top
-  App.screen.check(y, 'abc', 'F - test_down_arrow_scrolls_down_by_one_screen_line/baseline/screen:1')
+  App.screen.check(y, 'abc', 'baseline/screen:1')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'def', 'F - test_down_arrow_scrolls_down_by_one_screen_line/baseline/screen:2')
+  App.screen.check(y, 'def', 'baseline/screen:2')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'ghi ', 'F - test_down_arrow_scrolls_down_by_one_screen_line/baseline/screen:3')  -- line wrapping includes trailing whitespace
+  App.screen.check(y, 'ghi ', 'baseline/screen:3')  -- line wrapping includes trailing whitespace
   -- after hitting the down arrow the screen scrolls down by one line
   edit.run_after_keychord(Editor_state, 'down')
-  check_eq(Editor_state.screen_top1.line, 2, 'F - test_down_arrow_scrolls_down_by_one_screen_line/screen_top')
-  check_eq(Editor_state.cursor1.line, 3, 'F - test_down_arrow_scrolls_down_by_one_screen_line/cursor:line')
-  check_eq(Editor_state.cursor1.pos, 5, 'F - test_down_arrow_scrolls_down_by_one_screen_line/cursor:pos')
+  check_eq(Editor_state.screen_top1.line, 2, 'screen_top')
+  check_eq(Editor_state.cursor1.line, 3, 'cursor:line')
+  check_eq(Editor_state.cursor1.pos, 5, 'cursor:pos')
   y = Editor_state.top
-  App.screen.check(y, 'def', 'F - test_down_arrow_scrolls_down_by_one_screen_line/screen:1')
+  App.screen.check(y, 'def', 'screen:1')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'ghi ', 'F - test_down_arrow_scrolls_down_by_one_screen_line/screen:2')
+  App.screen.check(y, 'ghi ', 'screen:2')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'jkl', 'F - test_down_arrow_scrolls_down_by_one_screen_line/screen:3')
+  App.screen.check(y, 'jkl', 'screen:3')
 end
 
 function test_down_arrow_scrolls_down_by_one_screen_line_after_splitting_within_word()
-  io.write('\ntest_down_arrow_scrolls_down_by_one_screen_line_after_splitting_within_word')
   -- display the first three lines with the cursor on the bottom line
   App.screen.init{width=Editor_state.left+30, height=60}
   Editor_state = edit.initialize_test_state()
@@ -1185,26 +1123,25 @@ function test_down_arrow_scrolls_down_by_one_screen_line_after_splitting_within_
   Editor_state.screen_bottom1 = {}
   edit.draw(Editor_state)
   local y = Editor_state.top
-  App.screen.check(y, 'abc', 'F - test_down_arrow_scrolls_down_by_one_screen_line_after_splitting_within_word/baseline/screen:1')
+  App.screen.check(y, 'abc', 'baseline/screen:1')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'def', 'F - test_down_arrow_scrolls_down_by_one_screen_line_after_splitting_within_word/baseline/screen:2')
+  App.screen.check(y, 'def', 'baseline/screen:2')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'ghij', 'F - test_down_arrow_scrolls_down_by_one_screen_line_after_splitting_within_word/baseline/screen:3')
+  App.screen.check(y, 'ghij', 'baseline/screen:3')
   -- after hitting the down arrow the screen scrolls down by one line
   edit.run_after_keychord(Editor_state, 'down')
-  check_eq(Editor_state.screen_top1.line, 2, 'F - test_down_arrow_scrolls_down_by_one_screen_line_after_splitting_within_word/screen_top')
-  check_eq(Editor_state.cursor1.line, 3, 'F - test_down_arrow_scrolls_down_by_one_screen_line_after_splitting_within_word/cursor:line')
-  check_eq(Editor_state.cursor1.pos, 5, 'F - test_down_arrow_scrolls_down_by_one_screen_line_after_splitting_within_word/cursor:pos')
+  check_eq(Editor_state.screen_top1.line, 2, 'screen_top')
+  check_eq(Editor_state.cursor1.line, 3, 'cursor:line')
+  check_eq(Editor_state.cursor1.pos, 5, 'cursor:pos')
   y = Editor_state.top
-  App.screen.check(y, 'def', 'F - test_down_arrow_scrolls_down_by_one_screen_line_after_splitting_within_word/screen:1')
+  App.screen.check(y, 'def', 'screen:1')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'ghij', 'F - test_down_arrow_scrolls_down_by_one_screen_line_after_splitting_within_word/screen:2')
+  App.screen.check(y, 'ghij', 'screen:2')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'kl', 'F - test_down_arrow_scrolls_down_by_one_screen_line_after_splitting_within_word/screen:3')
+  App.screen.check(y, 'kl', 'screen:3')
 end
 
 function test_pagedown_followed_by_down_arrow_does_not_scroll_screen_up()
-  io.write('\ntest_pagedown_followed_by_down_arrow_does_not_scroll_screen_up')
   App.screen.init{width=Editor_state.left+30, height=60}
   Editor_state = edit.initialize_test_state()
   Editor_state.lines = load_array{'abc', 'def', 'ghijkl', 'mno'}
@@ -1214,31 +1151,30 @@ function test_pagedown_followed_by_down_arrow_does_not_scroll_screen_up()
   Editor_state.screen_bottom1 = {}
   edit.draw(Editor_state)
   local y = Editor_state.top
-  App.screen.check(y, 'abc', 'F - test_pagedown_followed_by_down_arrow_does_not_scroll_screen_up/baseline/screen:1')
+  App.screen.check(y, 'abc', 'baseline/screen:1')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'def', 'F - test_pagedown_followed_by_down_arrow_does_not_scroll_screen_up/baseline/screen:2')
+  App.screen.check(y, 'def', 'baseline/screen:2')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'ghij', 'F - test_pagedown_followed_by_down_arrow_does_not_scroll_screen_up/baseline/screen:3')
+  App.screen.check(y, 'ghij', 'baseline/screen:3')
   -- after hitting pagedown the screen scrolls down to start of a long line
   edit.run_after_keychord(Editor_state, 'pagedown')
-  check_eq(Editor_state.screen_top1.line, 3, 'F - test_pagedown_followed_by_down_arrow_does_not_scroll_screen_up/baseline2/screen_top')
-  check_eq(Editor_state.cursor1.line, 3, 'F - test_pagedown_followed_by_down_arrow_does_not_scroll_screen_up/baseline2/cursor:line')
-  check_eq(Editor_state.cursor1.pos, 1, 'F - test_pagedown_followed_by_down_arrow_does_not_scroll_screen_up/baseline2/cursor:pos')
+  check_eq(Editor_state.screen_top1.line, 3, 'baseline2/screen_top')
+  check_eq(Editor_state.cursor1.line, 3, 'baseline2/cursor:line')
+  check_eq(Editor_state.cursor1.pos, 1, 'baseline2/cursor:pos')
   -- after hitting down arrow the screen doesn't scroll down further, and certainly doesn't scroll up
   edit.run_after_keychord(Editor_state, 'down')
-  check_eq(Editor_state.screen_top1.line, 3, 'F - test_pagedown_followed_by_down_arrow_does_not_scroll_screen_up/screen_top')
-  check_eq(Editor_state.cursor1.line, 3, 'F - test_pagedown_followed_by_down_arrow_does_not_scroll_screen_up/cursor:line')
-  check_eq(Editor_state.cursor1.pos, 5, 'F - test_pagedown_followed_by_down_arrow_does_not_scroll_screen_up/cursor:pos')
+  check_eq(Editor_state.screen_top1.line, 3, 'screen_top')
+  check_eq(Editor_state.cursor1.line, 3, 'cursor:line')
+  check_eq(Editor_state.cursor1.pos, 5, 'cursor:pos')
   y = Editor_state.top
-  App.screen.check(y, 'ghij', 'F - test_pagedown_followed_by_down_arrow_does_not_scroll_screen_up/screen:1')
+  App.screen.check(y, 'ghij', 'screen:1')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'kl', 'F - test_pagedown_followed_by_down_arrow_does_not_scroll_screen_up/screen:2')
+  App.screen.check(y, 'kl', 'screen:2')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'mno', 'F - test_pagedown_followed_by_down_arrow_does_not_scroll_screen_up/screen:3')
+  App.screen.check(y, 'mno', 'screen:3')
 end
 
 function test_up_arrow_moves_cursor()
-  io.write('\ntest_up_arrow_moves_cursor')
   -- display the first 3 lines with the cursor on the bottom line
   App.screen.init{width=120, height=60}
   Editor_state = edit.initialize_test_state()
@@ -1249,26 +1185,25 @@ function test_up_arrow_moves_cursor()
   Editor_state.screen_bottom1 = {}
   edit.draw(Editor_state)
   local y = Editor_state.top
-  App.screen.check(y, 'abc', 'F - test_up_arrow_moves_cursor/baseline/screen:1')
+  App.screen.check(y, 'abc', 'baseline/screen:1')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'def', 'F - test_up_arrow_moves_cursor/baseline/screen:2')
+  App.screen.check(y, 'def', 'baseline/screen:2')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'ghi', 'F - test_up_arrow_moves_cursor/baseline/screen:3')
+  App.screen.check(y, 'ghi', 'baseline/screen:3')
   -- after hitting the up arrow the cursor moves up by 1 line
   edit.run_after_keychord(Editor_state, 'up')
-  check_eq(Editor_state.screen_top1.line, 1, 'F - test_up_arrow_moves_cursor/screen_top')
-  check_eq(Editor_state.cursor1.line, 2, 'F - test_up_arrow_moves_cursor/cursor')
+  check_eq(Editor_state.screen_top1.line, 1, 'screen_top')
+  check_eq(Editor_state.cursor1.line, 2, 'cursor')
   -- the screen is unchanged
   y = Editor_state.top
-  App.screen.check(y, 'abc', 'F - test_up_arrow_moves_cursor/screen:1')
+  App.screen.check(y, 'abc', 'screen:1')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'def', 'F - test_up_arrow_moves_cursor/screen:2')
+  App.screen.check(y, 'def', 'screen:2')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'ghi', 'F - test_up_arrow_moves_cursor/screen:3')
+  App.screen.check(y, 'ghi', 'screen:3')
 end
 
 function test_up_arrow_scrolls_up_by_one_line()
-  io.write('\ntest_up_arrow_scrolls_up_by_one_line')
   -- display the lines 2/3/4 with the cursor on line 2
   App.screen.init{width=120, height=60}
   Editor_state = edit.initialize_test_state()
@@ -1279,25 +1214,24 @@ function test_up_arrow_scrolls_up_by_one_line()
   Editor_state.screen_bottom1 = {}
   edit.draw(Editor_state)
   local y = Editor_state.top
-  App.screen.check(y, 'def', 'F - test_up_arrow_scrolls_up_by_one_line/baseline/screen:1')
+  App.screen.check(y, 'def', 'baseline/screen:1')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'ghi', 'F - test_up_arrow_scrolls_up_by_one_line/baseline/screen:2')
+  App.screen.check(y, 'ghi', 'baseline/screen:2')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'jkl', 'F - test_up_arrow_scrolls_up_by_one_line/baseline/screen:3')
+  App.screen.check(y, 'jkl', 'baseline/screen:3')
   -- after hitting the up arrow the screen scrolls up by one line
   edit.run_after_keychord(Editor_state, 'up')
-  check_eq(Editor_state.screen_top1.line, 1, 'F - test_up_arrow_scrolls_up_by_one_line/screen_top')
-  check_eq(Editor_state.cursor1.line, 1, 'F - test_up_arrow_scrolls_up_by_one_line/cursor')
+  check_eq(Editor_state.screen_top1.line, 1, 'screen_top')
+  check_eq(Editor_state.cursor1.line, 1, 'cursor')
   y = Editor_state.top
-  App.screen.check(y, 'abc', 'F - test_up_arrow_scrolls_up_by_one_line/screen:1')
+  App.screen.check(y, 'abc', 'screen:1')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'def', 'F - test_up_arrow_scrolls_up_by_one_line/screen:2')
+  App.screen.check(y, 'def', 'screen:2')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'ghi', 'F - test_up_arrow_scrolls_up_by_one_line/screen:3')
+  App.screen.check(y, 'ghi', 'screen:3')
 end
 
 function test_up_arrow_scrolls_up_by_one_screen_line()
-  io.write('\ntest_up_arrow_scrolls_up_by_one_screen_line')
   -- display lines starting from second screen line of a line
   App.screen.init{width=Editor_state.left+30, height=60}
   Editor_state = edit.initialize_test_state()
@@ -1308,25 +1242,24 @@ function test_up_arrow_scrolls_up_by_one_screen_line()
   Editor_state.screen_bottom1 = {}
   edit.draw(Editor_state)
   local y = Editor_state.top
-  App.screen.check(y, 'jkl', 'F - test_up_arrow_scrolls_up_by_one_screen_line/baseline/screen:1')
+  App.screen.check(y, 'jkl', 'baseline/screen:1')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'mno', 'F - test_up_arrow_scrolls_up_by_one_screen_line/baseline/screen:2')
+  App.screen.check(y, 'mno', 'baseline/screen:2')
   -- after hitting the up arrow the screen scrolls up to first screen line
   edit.run_after_keychord(Editor_state, 'up')
   y = Editor_state.top
-  App.screen.check(y, 'ghi ', 'F - test_up_arrow_scrolls_up_by_one_screen_line/screen:1')
+  App.screen.check(y, 'ghi ', 'screen:1')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'jkl', 'F - test_up_arrow_scrolls_up_by_one_screen_line/screen:2')
+  App.screen.check(y, 'jkl', 'screen:2')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'mno', 'F - test_up_arrow_scrolls_up_by_one_screen_line/screen:3')
-  check_eq(Editor_state.screen_top1.line, 3, 'F - test_up_arrow_scrolls_up_by_one_screen_line/screen_top')
-  check_eq(Editor_state.screen_top1.pos, 1, 'F - test_up_arrow_scrolls_up_by_one_screen_line/screen_top')
-  check_eq(Editor_state.cursor1.line, 3, 'F - test_up_arrow_scrolls_up_by_one_screen_line/cursor:line')
-  check_eq(Editor_state.cursor1.pos, 1, 'F - test_up_arrow_scrolls_up_by_one_screen_line/cursor:pos')
+  App.screen.check(y, 'mno', 'screen:3')
+  check_eq(Editor_state.screen_top1.line, 3, 'screen_top:line')
+  check_eq(Editor_state.screen_top1.pos, 1, 'screen_top:pos')
+  check_eq(Editor_state.cursor1.line, 3, 'cursor:line')
+  check_eq(Editor_state.cursor1.pos, 1, 'cursor:pos')
 end
 
 function test_up_arrow_scrolls_up_to_final_screen_line()
-  io.write('\ntest_up_arrow_scrolls_up_to_final_screen_line')
   -- display lines starting just after a long line
   App.screen.init{width=Editor_state.left+30, height=60}
   Editor_state = edit.initialize_test_state()
@@ -1337,27 +1270,26 @@ function test_up_arrow_scrolls_up_to_final_screen_line()
   Editor_state.screen_bottom1 = {}
   edit.draw(Editor_state)
   local y = Editor_state.top
-  App.screen.check(y, 'ghi', 'F - test_up_arrow_scrolls_up_to_final_screen_line/baseline/screen:1')
+  App.screen.check(y, 'ghi', 'baseline/screen:1')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'jkl', 'F - test_up_arrow_scrolls_up_to_final_screen_line/baseline/screen:2')
+  App.screen.check(y, 'jkl', 'baseline/screen:2')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'mno', 'F - test_up_arrow_scrolls_up_to_final_screen_line/baseline/screen:3')
+  App.screen.check(y, 'mno', 'baseline/screen:3')
   -- after hitting the up arrow the screen scrolls up to final screen line of previous line
   edit.run_after_keychord(Editor_state, 'up')
   y = Editor_state.top
-  App.screen.check(y, 'def', 'F - test_up_arrow_scrolls_up_to_final_screen_line/screen:1')
+  App.screen.check(y, 'def', 'screen:1')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'ghi', 'F - test_up_arrow_scrolls_up_to_final_screen_line/screen:2')
+  App.screen.check(y, 'ghi', 'screen:2')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'jkl', 'F - test_up_arrow_scrolls_up_to_final_screen_line/screen:3')
-  check_eq(Editor_state.screen_top1.line, 1, 'F - test_up_arrow_scrolls_up_to_final_screen_line/screen_top')
-  check_eq(Editor_state.screen_top1.pos, 5, 'F - test_up_arrow_scrolls_up_to_final_screen_line/screen_top')
-  check_eq(Editor_state.cursor1.line, 1, 'F - test_up_arrow_scrolls_up_to_final_screen_line/cursor:line')
-  check_eq(Editor_state.cursor1.pos, 5, 'F - test_up_arrow_scrolls_up_to_final_screen_line/cursor:pos')
+  App.screen.check(y, 'jkl', 'screen:3')
+  check_eq(Editor_state.screen_top1.line, 1, 'screen_top:line')
+  check_eq(Editor_state.screen_top1.pos, 5, 'screen_top:pos')
+  check_eq(Editor_state.cursor1.line, 1, 'cursor:line')
+  check_eq(Editor_state.cursor1.pos, 5, 'cursor:pos')
 end
 
 function test_up_arrow_scrolls_up_to_empty_line()
-  io.write('\ntest_up_arrow_scrolls_up_to_empty_line')
   -- display a screenful of text with an empty line just above it outside the screen
   App.screen.init{width=120, height=60}
   Editor_state = edit.initialize_test_state()
@@ -1368,25 +1300,24 @@ function test_up_arrow_scrolls_up_to_empty_line()
   Editor_state.screen_bottom1 = {}
   edit.draw(Editor_state)
   local y = Editor_state.top
-  App.screen.check(y, 'abc', 'F - test_up_arrow_scrolls_up_to_empty_line/baseline/screen:1')
+  App.screen.check(y, 'abc', 'baseline/screen:1')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'def', 'F - test_up_arrow_scrolls_up_to_empty_line/baseline/screen:2')
+  App.screen.check(y, 'def', 'baseline/screen:2')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'ghi', 'F - test_up_arrow_scrolls_up_to_empty_line/baseline/screen:3')
+  App.screen.check(y, 'ghi', 'baseline/screen:3')
   -- after hitting the up arrow the screen scrolls up by one line
   edit.run_after_keychord(Editor_state, 'up')
-  check_eq(Editor_state.screen_top1.line, 1, 'F - test_up_arrow_scrolls_up_to_empty_line/screen_top')
-  check_eq(Editor_state.cursor1.line, 1, 'F - test_up_arrow_scrolls_up_to_empty_line/cursor')
+  check_eq(Editor_state.screen_top1.line, 1, 'screen_top')
+  check_eq(Editor_state.cursor1.line, 1, 'cursor')
   y = Editor_state.top
   -- empty first line
   y = y + Editor_state.line_height
-  App.screen.check(y, 'abc', 'F - test_up_arrow_scrolls_up_to_empty_line/screen:2')
+  App.screen.check(y, 'abc', 'screen:2')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'def', 'F - test_up_arrow_scrolls_up_to_empty_line/screen:3')
+  App.screen.check(y, 'def', 'screen:3')
 end
 
 function test_pageup()
-  io.write('\ntest_pageup')
   App.screen.init{width=120, height=45}
   Editor_state = edit.initialize_test_state()
   Editor_state.lines = load_array{'abc', 'def', 'ghi'}
@@ -1397,21 +1328,20 @@ function test_pageup()
   -- initially the last two lines are displayed
   edit.draw(Editor_state)
   local y = Editor_state.top
-  App.screen.check(y, 'def', 'F - test_pageup/baseline/screen:1')
+  App.screen.check(y, 'def', 'baseline/screen:1')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'ghi', 'F - test_pageup/baseline/screen:2')
+  App.screen.check(y, 'ghi', 'baseline/screen:2')
   -- after pageup the cursor goes to first line
   edit.run_after_keychord(Editor_state, 'pageup')
-  check_eq(Editor_state.screen_top1.line, 1, 'F - test_pageup/screen_top')
-  check_eq(Editor_state.cursor1.line, 1, 'F - test_pageup/cursor')
+  check_eq(Editor_state.screen_top1.line, 1, 'screen_top')
+  check_eq(Editor_state.cursor1.line, 1, 'cursor')
   y = Editor_state.top
-  App.screen.check(y, 'abc', 'F - test_pageup/screen:1')
+  App.screen.check(y, 'abc', 'screen:1')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'def', 'F - test_pageup/screen:2')
+  App.screen.check(y, 'def', 'screen:2')
 end
 
 function test_pageup_scrolls_up_by_screen_line()
-  io.write('\ntest_pageup_scrolls_up_by_screen_line')
   -- display the first three lines with the cursor on the bottom line
   App.screen.init{width=Editor_state.left+30, height=60}
   Editor_state = edit.initialize_test_state()
@@ -1422,26 +1352,25 @@ function test_pageup_scrolls_up_by_screen_line()
   Editor_state.screen_bottom1 = {}
   edit.draw(Editor_state)
   local y = Editor_state.top
-  App.screen.check(y, 'ghi', 'F - test_pageup_scrolls_up_by_screen_line/baseline/screen:1')
+  App.screen.check(y, 'ghi', 'baseline/screen:1')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'jkl', 'F - test_pageup_scrolls_up_by_screen_line/baseline/screen:2')
+  App.screen.check(y, 'jkl', 'baseline/screen:2')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'mno', 'F - test_pageup_scrolls_up_by_screen_line/baseline/screen:3')  -- line wrapping includes trailing whitespace
+  App.screen.check(y, 'mno', 'baseline/screen:3')  -- line wrapping includes trailing whitespace
   -- after hitting the page-up key the screen scrolls up to top
   edit.run_after_keychord(Editor_state, 'pageup')
-  check_eq(Editor_state.screen_top1.line, 1, 'F - test_pageup_scrolls_up_by_screen_line/screen_top')
-  check_eq(Editor_state.cursor1.line, 1, 'F - test_pageup_scrolls_up_by_screen_line/cursor:line')
-  check_eq(Editor_state.cursor1.pos, 1, 'F - test_pageup_scrolls_up_by_screen_line/cursor:pos')
+  check_eq(Editor_state.screen_top1.line, 1, 'screen_top')
+  check_eq(Editor_state.cursor1.line, 1, 'cursor:line')
+  check_eq(Editor_state.cursor1.pos, 1, 'cursor:pos')
   y = Editor_state.top
-  App.screen.check(y, 'abc ', 'F - test_pageup_scrolls_up_by_screen_line/screen:1')
+  App.screen.check(y, 'abc ', 'screen:1')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'def', 'F - test_pageup_scrolls_up_by_screen_line/screen:2')
+  App.screen.check(y, 'def', 'screen:2')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'ghi', 'F - test_pageup_scrolls_up_by_screen_line/screen:3')
+  App.screen.check(y, 'ghi', 'screen:3')
 end
 
 function test_pageup_scrolls_up_from_middle_screen_line()
-  io.write('\ntest_pageup_scrolls_up_from_middle_screen_line')
   -- display a few lines starting from the middle of a line (Editor_state.cursor1.pos > 1)
   App.screen.init{width=Editor_state.left+30, height=60}
   Editor_state = edit.initialize_test_state()
@@ -1452,24 +1381,23 @@ function test_pageup_scrolls_up_from_middle_screen_line()
   Editor_state.screen_bottom1 = {}
   edit.draw(Editor_state)
   local y = Editor_state.top
-  App.screen.check(y, 'jkl', 'F - test_pageup_scrolls_up_from_middle_screen_line/baseline/screen:2')
+  App.screen.check(y, 'jkl', 'baseline/screen:2')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'mno', 'F - test_pageup_scrolls_up_from_middle_screen_line/baseline/screen:3')  -- line wrapping includes trailing whitespace
+  App.screen.check(y, 'mno', 'baseline/screen:3')  -- line wrapping includes trailing whitespace
   -- after hitting the page-up key the screen scrolls up to top
   edit.run_after_keychord(Editor_state, 'pageup')
-  check_eq(Editor_state.screen_top1.line, 1, 'F - test_pageup_scrolls_up_from_middle_screen_line/screen_top')
-  check_eq(Editor_state.cursor1.line, 1, 'F - test_pageup_scrolls_up_from_middle_screen_line/cursor:line')
-  check_eq(Editor_state.cursor1.pos, 1, 'F - test_pageup_scrolls_up_from_middle_screen_line/cursor:pos')
+  check_eq(Editor_state.screen_top1.line, 1, 'screen_top')
+  check_eq(Editor_state.cursor1.line, 1, 'cursor:line')
+  check_eq(Editor_state.cursor1.pos, 1, 'cursor:pos')
   y = Editor_state.top
-  App.screen.check(y, 'abc ', 'F - test_pageup_scrolls_up_from_middle_screen_line/screen:1')
+  App.screen.check(y, 'abc ', 'screen:1')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'def', 'F - test_pageup_scrolls_up_from_middle_screen_line/screen:2')
+  App.screen.check(y, 'def', 'screen:2')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'ghi ', 'F - test_pageup_scrolls_up_from_middle_screen_line/screen:3')
+  App.screen.check(y, 'ghi ', 'screen:3')
 end
 
 function test_enter_on_bottom_line_scrolls_down()
-  io.write('\ntest_enter_on_bottom_line_scrolls_down')
   -- display a few lines with cursor on bottom line
   App.screen.init{width=Editor_state.left+30, height=60}
   Editor_state = edit.initialize_test_state()
@@ -1480,26 +1408,25 @@ function test_enter_on_bottom_line_scrolls_down()
   Editor_state.screen_bottom1 = {}
   edit.draw(Editor_state)
   local y = Editor_state.top
-  App.screen.check(y, 'abc', 'F - test_enter_on_bottom_line_scrolls_down/baseline/screen:1')
+  App.screen.check(y, 'abc', 'baseline/screen:1')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'def', 'F - test_enter_on_bottom_line_scrolls_down/baseline/screen:2')
+  App.screen.check(y, 'def', 'baseline/screen:2')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'ghi', 'F - test_enter_on_bottom_line_scrolls_down/baseline/screen:3')
+  App.screen.check(y, 'ghi', 'baseline/screen:3')
   -- after hitting the enter key the screen scrolls down
   edit.run_after_keychord(Editor_state, 'return')
-  check_eq(Editor_state.screen_top1.line, 2, 'F - test_enter_on_bottom_line_scrolls_down/screen_top')
-  check_eq(Editor_state.cursor1.line, 4, 'F - test_enter_on_bottom_line_scrolls_down/cursor:line')
-  check_eq(Editor_state.cursor1.pos, 1, 'F - test_enter_on_bottom_line_scrolls_down/cursor:pos')
+  check_eq(Editor_state.screen_top1.line, 2, 'screen_top')
+  check_eq(Editor_state.cursor1.line, 4, 'cursor:line')
+  check_eq(Editor_state.cursor1.pos, 1, 'cursor:pos')
   y = Editor_state.top
-  App.screen.check(y, 'def', 'F - test_enter_on_bottom_line_scrolls_down/screen:1')
+  App.screen.check(y, 'def', 'screen:1')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'g', 'F - test_enter_on_bottom_line_scrolls_down/screen:2')
+  App.screen.check(y, 'g', 'screen:2')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'hi', 'F - test_enter_on_bottom_line_scrolls_down/screen:3')
+  App.screen.check(y, 'hi', 'screen:3')
 end
 
 function test_enter_on_final_line_avoids_scrolling_down_when_not_at_bottom()
-  io.write('\ntest_enter_on_final_line_avoids_scrolling_down_when_not_at_bottom')
   -- display just the bottom line on screen
   App.screen.init{width=Editor_state.left+30, height=60}
   Editor_state = edit.initialize_test_state()
@@ -1510,20 +1437,19 @@ function test_enter_on_final_line_avoids_scrolling_down_when_not_at_bottom()
   Editor_state.screen_bottom1 = {}
   edit.draw(Editor_state)
   local y = Editor_state.top
-  App.screen.check(y, 'jkl', 'F - test_enter_on_final_line_avoids_scrolling_down_when_not_at_bottom/baseline/screen:1')
+  App.screen.check(y, 'jkl', 'baseline/screen:1')
   -- after hitting the enter key the screen does not scroll down
   edit.run_after_keychord(Editor_state, 'return')
-  check_eq(Editor_state.screen_top1.line, 4, 'F - test_enter_on_final_line_avoids_scrolling_down_when_not_at_bottom/screen_top')
-  check_eq(Editor_state.cursor1.line, 5, 'F - test_enter_on_final_line_avoids_scrolling_down_when_not_at_bottom/cursor:line')
-  check_eq(Editor_state.cursor1.pos, 1, 'F - test_enter_on_final_line_avoids_scrolling_down_when_not_at_bottom/cursor:pos')
+  check_eq(Editor_state.screen_top1.line, 4, 'screen_top')
+  check_eq(Editor_state.cursor1.line, 5, 'cursor:line')
+  check_eq(Editor_state.cursor1.pos, 1, 'cursor:pos')
   y = Editor_state.top
-  App.screen.check(y, 'j', 'F - test_enter_on_final_line_avoids_scrolling_down_when_not_at_bottom/screen:1')
+  App.screen.check(y, 'j', 'screen:1')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'kl', 'F - test_enter_on_final_line_avoids_scrolling_down_when_not_at_bottom/screen:2')
+  App.screen.check(y, 'kl', 'screen:2')
 end
 
 function test_inserting_text_on_final_line_avoids_scrolling_down_when_not_at_bottom()
-  io.write('\ntest_inserting_text_on_final_line_avoids_scrolling_down_when_not_at_bottom')
   -- display just an empty bottom line on screen
   App.screen.init{width=Editor_state.left+30, height=60}
   Editor_state = edit.initialize_test_state()
@@ -1535,15 +1461,14 @@ function test_inserting_text_on_final_line_avoids_scrolling_down_when_not_at_bot
   edit.draw(Editor_state)
   -- after hitting the inserting_text key the screen does not scroll down
   edit.run_after_text_input(Editor_state, 'a')
-  check_eq(Editor_state.screen_top1.line, 2, 'F - test_inserting_text_on_final_line_avoids_scrolling_down_when_not_at_bottom/screen_top')
-  check_eq(Editor_state.cursor1.line, 2, 'F - test_inserting_text_on_final_line_avoids_scrolling_down_when_not_at_bottom/cursor:line')
-  check_eq(Editor_state.cursor1.pos, 2, 'F - test_inserting_text_on_final_line_avoids_scrolling_down_when_not_at_bottom/cursor:pos')
+  check_eq(Editor_state.screen_top1.line, 2, 'screen_top')
+  check_eq(Editor_state.cursor1.line, 2, 'cursor:line')
+  check_eq(Editor_state.cursor1.pos, 2, 'cursor:pos')
   local y = Editor_state.top
-  App.screen.check(y, 'a', 'F - test_inserting_text_on_final_line_avoids_scrolling_down_when_not_at_bottom/screen:1')
+  App.screen.check(y, 'a', 'screen:1')
 end
 
 function test_typing_on_bottom_line_scrolls_down()
-  io.write('\ntest_typing_on_bottom_line_scrolls_down')
   -- display a few lines with cursor on bottom line
   App.screen.init{width=Editor_state.left+30, height=60}
   Editor_state = edit.initialize_test_state()
@@ -1554,28 +1479,27 @@ function test_typing_on_bottom_line_scrolls_down()
   Editor_state.screen_bottom1 = {}
   edit.draw(Editor_state)
   local y = Editor_state.top
-  App.screen.check(y, 'abc', 'F - test_typing_on_bottom_line_scrolls_down/baseline/screen:1')
+  App.screen.check(y, 'abc', 'baseline/screen:1')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'def', 'F - test_typing_on_bottom_line_scrolls_down/baseline/screen:2')
+  App.screen.check(y, 'def', 'baseline/screen:2')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'ghi', 'F - test_typing_on_bottom_line_scrolls_down/baseline/screen:3')
+  App.screen.check(y, 'ghi', 'baseline/screen:3')
   -- after typing something the line wraps and the screen scrolls down
   edit.run_after_text_input(Editor_state, 'j')
   edit.run_after_text_input(Editor_state, 'k')
   edit.run_after_text_input(Editor_state, 'l')
-  check_eq(Editor_state.screen_top1.line, 2, 'F - test_typing_on_bottom_line_scrolls_down/screen_top')
-  check_eq(Editor_state.cursor1.line, 3, 'F - test_typing_on_bottom_line_scrolls_down/cursor:line')
-  check_eq(Editor_state.cursor1.pos, 7, 'F - test_typing_on_bottom_line_scrolls_down/cursor:pos')
+  check_eq(Editor_state.screen_top1.line, 2, 'screen_top')
+  check_eq(Editor_state.cursor1.line, 3, 'cursor:line')
+  check_eq(Editor_state.cursor1.pos, 7, 'cursor:pos')
   y = Editor_state.top
-  App.screen.check(y, 'def', 'F - test_typing_on_bottom_line_scrolls_down/screen:1')
+  App.screen.check(y, 'def', 'screen:1')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'ghij', 'F - test_typing_on_bottom_line_scrolls_down/screen:2')
+  App.screen.check(y, 'ghij', 'screen:2')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'kl', 'F - test_typing_on_bottom_line_scrolls_down/screen:3')
+  App.screen.check(y, 'kl', 'screen:3')
 end
 
 function test_left_arrow_scrolls_up_in_wrapped_line()
-  io.write('\ntest_left_arrow_scrolls_up_in_wrapped_line')
   -- display lines starting from second screen line of a line
   App.screen.init{width=Editor_state.left+30, height=60}
   Editor_state = edit.initialize_test_state()
@@ -1587,25 +1511,24 @@ function test_left_arrow_scrolls_up_in_wrapped_line()
   Editor_state.cursor1 = {line=3, pos=5}
   edit.draw(Editor_state)
   local y = Editor_state.top
-  App.screen.check(y, 'jkl', 'F - test_left_arrow_scrolls_up_in_wrapped_line/baseline/screen:1')
+  App.screen.check(y, 'jkl', 'baseline/screen:1')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'mno', 'F - test_left_arrow_scrolls_up_in_wrapped_line/baseline/screen:2')
+  App.screen.check(y, 'mno', 'baseline/screen:2')
   -- after hitting the left arrow the screen scrolls up to first screen line
   edit.run_after_keychord(Editor_state, 'left')
   y = Editor_state.top
-  App.screen.check(y, 'ghi ', 'F - test_left_arrow_scrolls_up_in_wrapped_line/screen:1')
+  App.screen.check(y, 'ghi ', 'screen:1')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'jkl', 'F - test_left_arrow_scrolls_up_in_wrapped_line/screen:2')
+  App.screen.check(y, 'jkl', 'screen:2')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'mno', 'F - test_left_arrow_scrolls_up_in_wrapped_line/screen:3')
-  check_eq(Editor_state.screen_top1.line, 3, 'F - test_left_arrow_scrolls_up_in_wrapped_line/screen_top')
-  check_eq(Editor_state.screen_top1.pos, 1, 'F - test_left_arrow_scrolls_up_in_wrapped_line/screen_top')
-  check_eq(Editor_state.cursor1.line, 3, 'F - test_left_arrow_scrolls_up_in_wrapped_line/cursor:line')
-  check_eq(Editor_state.cursor1.pos, 4, 'F - test_left_arrow_scrolls_up_in_wrapped_line/cursor:pos')
+  App.screen.check(y, 'mno', 'screen:3')
+  check_eq(Editor_state.screen_top1.line, 3, 'screen_top:line')
+  check_eq(Editor_state.screen_top1.pos, 1, 'screen_top:pos')
+  check_eq(Editor_state.cursor1.line, 3, 'cursor:line')
+  check_eq(Editor_state.cursor1.pos, 4, 'cursor:pos')
 end
 
 function test_right_arrow_scrolls_down_in_wrapped_line()
-  io.write('\ntest_right_arrow_scrolls_down_in_wrapped_line')
   -- display the first three lines with the cursor on the bottom line
   App.screen.init{width=Editor_state.left+30, height=60}
   Editor_state = edit.initialize_test_state()
@@ -1617,26 +1540,25 @@ function test_right_arrow_scrolls_down_in_wrapped_line()
   Editor_state.cursor1 = {line=3, pos=5}
   edit.draw(Editor_state)
   local y = Editor_state.top
-  App.screen.check(y, 'abc', 'F - test_right_arrow_scrolls_down_in_wrapped_line/baseline/screen:1')
+  App.screen.check(y, 'abc', 'baseline/screen:1')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'def', 'F - test_right_arrow_scrolls_down_in_wrapped_line/baseline/screen:2')
+  App.screen.check(y, 'def', 'baseline/screen:2')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'ghi ', 'F - test_right_arrow_scrolls_down_in_wrapped_line/baseline/screen:3')  -- line wrapping includes trailing whitespace
+  App.screen.check(y, 'ghi ', 'baseline/screen:3')  -- line wrapping includes trailing whitespace
   -- after hitting the right arrow the screen scrolls down by one line
   edit.run_after_keychord(Editor_state, 'right')
-  check_eq(Editor_state.screen_top1.line, 2, 'F - test_right_arrow_scrolls_down_in_wrapped_line/screen_top')
-  check_eq(Editor_state.cursor1.line, 3, 'F - test_right_arrow_scrolls_down_in_wrapped_line/cursor:line')
-  check_eq(Editor_state.cursor1.pos, 6, 'F - test_right_arrow_scrolls_down_in_wrapped_line/cursor:pos')
+  check_eq(Editor_state.screen_top1.line, 2, 'screen_top')
+  check_eq(Editor_state.cursor1.line, 3, 'cursor:line')
+  check_eq(Editor_state.cursor1.pos, 6, 'cursor:pos')
   y = Editor_state.top
-  App.screen.check(y, 'def', 'F - test_right_arrow_scrolls_down_in_wrapped_line/screen:1')
+  App.screen.check(y, 'def', 'screen:1')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'ghi ', 'F - test_right_arrow_scrolls_down_in_wrapped_line/screen:2')
+  App.screen.check(y, 'ghi ', 'screen:2')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'jkl', 'F - test_right_arrow_scrolls_down_in_wrapped_line/screen:3')
+  App.screen.check(y, 'jkl', 'screen:3')
 end
 
 function test_home_scrolls_up_in_wrapped_line()
-  io.write('\ntest_home_scrolls_up_in_wrapped_line')
   -- display lines starting from second screen line of a line
   App.screen.init{width=Editor_state.left+30, height=60}
   Editor_state = edit.initialize_test_state()
@@ -1648,25 +1570,24 @@ function test_home_scrolls_up_in_wrapped_line()
   Editor_state.cursor1 = {line=3, pos=5}
   edit.draw(Editor_state)
   local y = Editor_state.top
-  App.screen.check(y, 'jkl', 'F - test_home_scrolls_up_in_wrapped_line/baseline/screen:1')
+  App.screen.check(y, 'jkl', 'baseline/screen:1')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'mno', 'F - test_home_scrolls_up_in_wrapped_line/baseline/screen:2')
+  App.screen.check(y, 'mno', 'baseline/screen:2')
   -- after hitting home the screen scrolls up to first screen line
   edit.run_after_keychord(Editor_state, 'home')
   y = Editor_state.top
-  App.screen.check(y, 'ghi ', 'F - test_home_scrolls_up_in_wrapped_line/screen:1')
+  App.screen.check(y, 'ghi ', 'screen:1')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'jkl', 'F - test_home_scrolls_up_in_wrapped_line/screen:2')
+  App.screen.check(y, 'jkl', 'screen:2')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'mno', 'F - test_home_scrolls_up_in_wrapped_line/screen:3')
-  check_eq(Editor_state.screen_top1.line, 3, 'F - test_home_scrolls_up_in_wrapped_line/screen_top')
-  check_eq(Editor_state.screen_top1.pos, 1, 'F - test_home_scrolls_up_in_wrapped_line/screen_top')
-  check_eq(Editor_state.cursor1.line, 3, 'F - test_home_scrolls_up_in_wrapped_line/cursor:line')
-  check_eq(Editor_state.cursor1.pos, 1, 'F - test_home_scrolls_up_in_wrapped_line/cursor:pos')
+  App.screen.check(y, 'mno', 'screen:3')
+  check_eq(Editor_state.screen_top1.line, 3, 'screen_top:line')
+  check_eq(Editor_state.screen_top1.pos, 1, 'screen_top:pos')
+  check_eq(Editor_state.cursor1.line, 3, 'cursor:line')
+  check_eq(Editor_state.cursor1.pos, 1, 'cursor:pos')
 end
 
 function test_end_scrolls_down_in_wrapped_line()
-  io.write('\ntest_end_scrolls_down_in_wrapped_line')
   -- display the first three lines with the cursor on the bottom line
   App.screen.init{width=Editor_state.left+30, height=60}
   Editor_state = edit.initialize_test_state()
@@ -1678,27 +1599,26 @@ function test_end_scrolls_down_in_wrapped_line()
   Editor_state.cursor1 = {line=3, pos=5}
   edit.draw(Editor_state)
   local y = Editor_state.top
-  App.screen.check(y, 'abc', 'F - test_end_scrolls_down_in_wrapped_line/baseline/screen:1')
+  App.screen.check(y, 'abc', 'baseline/screen:1')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'def', 'F - test_end_scrolls_down_in_wrapped_line/baseline/screen:2')
+  App.screen.check(y, 'def', 'baseline/screen:2')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'ghi ', 'F - test_end_scrolls_down_in_wrapped_line/baseline/screen:3')  -- line wrapping includes trailing whitespace
+  App.screen.check(y, 'ghi ', 'baseline/screen:3')  -- line wrapping includes trailing whitespace
   -- after hitting end the screen scrolls down by one line
   edit.run_after_keychord(Editor_state, 'end')
-  check_eq(Editor_state.screen_top1.line, 2, 'F - test_end_scrolls_down_in_wrapped_line/screen_top')
-  check_eq(Editor_state.cursor1.line, 3, 'F - test_end_scrolls_down_in_wrapped_line/cursor:line')
-  check_eq(Editor_state.cursor1.pos, 8, 'F - test_end_scrolls_down_in_wrapped_line/cursor:pos')
+  check_eq(Editor_state.screen_top1.line, 2, 'screen_top')
+  check_eq(Editor_state.cursor1.line, 3, 'cursor:line')
+  check_eq(Editor_state.cursor1.pos, 8, 'cursor:pos')
   y = Editor_state.top
-  App.screen.check(y, 'def', 'F - test_end_scrolls_down_in_wrapped_line/screen:1')
+  App.screen.check(y, 'def', 'screen:1')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'ghi ', 'F - test_end_scrolls_down_in_wrapped_line/screen:2')
+  App.screen.check(y, 'ghi ', 'screen:2')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'jkl', 'F - test_end_scrolls_down_in_wrapped_line/screen:3')
+  App.screen.check(y, 'jkl', 'screen:3')
 end
 
 function test_position_cursor_on_recently_edited_wrapping_line()
   -- draw a line wrapping over 2 screen lines
-  io.write('\ntest_position_cursor_on_recently_edited_wrapping_line')
   App.screen.init{width=100, height=200}
   Editor_state = edit.initialize_test_state()
   Editor_state.lines = load_array{'abc def ghi jkl mno pqr ', 'xyz'}
@@ -1708,31 +1628,30 @@ function test_position_cursor_on_recently_edited_wrapping_line()
   Editor_state.screen_bottom1 = {}
   edit.draw(Editor_state)
   local y = Editor_state.top
-  App.screen.check(y, 'abc def ghi ', 'F - test_position_cursor_on_recently_edited_wrapping_line/baseline1/screen:1')
+  App.screen.check(y, 'abc def ghi ', 'baseline1/screen:1')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'jkl mno pqr ', 'F - test_position_cursor_on_recently_edited_wrapping_line/baseline1/screen:2')
+  App.screen.check(y, 'jkl mno pqr ', 'baseline1/screen:2')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'xyz', 'F - test_position_cursor_on_recently_edited_wrapping_line/baseline1/screen:3')
+  App.screen.check(y, 'xyz', 'baseline1/screen:3')
   -- add to the line until it's wrapping over 3 screen lines
   edit.run_after_text_input(Editor_state, 's')
   edit.run_after_text_input(Editor_state, 't')
   edit.run_after_text_input(Editor_state, 'u')
-  check_eq(Editor_state.cursor1.pos, 28, 'F - test_position_cursor_on_recently_edited_wrapping_line/cursor:pos')
+  check_eq(Editor_state.cursor1.pos, 28, 'cursor:pos')
   y = Editor_state.top
-  App.screen.check(y, 'abc def ghi ', 'F - test_position_cursor_on_recently_edited_wrapping_line/baseline2/screen:1')
+  App.screen.check(y, 'abc def ghi ', 'baseline2/screen:1')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'jkl mno pqr ', 'F - test_position_cursor_on_recently_edited_wrapping_line/baseline2/screen:2')
+  App.screen.check(y, 'jkl mno pqr ', 'baseline2/screen:2')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'stu', 'F - test_position_cursor_on_recently_edited_wrapping_line/baseline2/screen:3')
+  App.screen.check(y, 'stu', 'baseline2/screen:3')
   -- try to move the cursor earlier in the third screen line by clicking the mouse
   edit.run_after_mouse_release(Editor_state, Editor_state.left+8,Editor_state.top+Editor_state.line_height*2+5, 1)
   -- cursor should move
-  check_eq(Editor_state.cursor1.line, 1, 'F - test_position_cursor_on_recently_edited_wrapping_line/cursor:line')
-  check_eq(Editor_state.cursor1.pos, 26, 'F - test_position_cursor_on_recently_edited_wrapping_line/cursor:pos')
+  check_eq(Editor_state.cursor1.line, 1, 'cursor:line')
+  check_eq(Editor_state.cursor1.pos, 26, 'cursor:pos')
 end
 
 function test_backspace_can_scroll_up()
-  io.write('\ntest_backspace_can_scroll_up')
   -- display the lines 2/3/4 with the cursor on line 2
   App.screen.init{width=120, height=60}
   Editor_state = edit.initialize_test_state()
@@ -1743,25 +1662,24 @@ function test_backspace_can_scroll_up()
   Editor_state.screen_bottom1 = {}
   edit.draw(Editor_state)
   local y = Editor_state.top
-  App.screen.check(y, 'def', 'F - test_backspace_can_scroll_up/baseline/screen:1')
+  App.screen.check(y, 'def', 'baseline/screen:1')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'ghi', 'F - test_backspace_can_scroll_up/baseline/screen:2')
+  App.screen.check(y, 'ghi', 'baseline/screen:2')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'jkl', 'F - test_backspace_can_scroll_up/baseline/screen:3')
+  App.screen.check(y, 'jkl', 'baseline/screen:3')
   -- after hitting backspace the screen scrolls up by one line
   edit.run_after_keychord(Editor_state, 'backspace')
-  check_eq(Editor_state.screen_top1.line, 1, 'F - test_backspace_can_scroll_up/screen_top')
-  check_eq(Editor_state.cursor1.line, 1, 'F - test_backspace_can_scroll_up/cursor')
+  check_eq(Editor_state.screen_top1.line, 1, 'screen_top')
+  check_eq(Editor_state.cursor1.line, 1, 'cursor')
   y = Editor_state.top
-  App.screen.check(y, 'abcdef', 'F - test_backspace_can_scroll_up/screen:1')
+  App.screen.check(y, 'abcdef', 'screen:1')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'ghi', 'F - test_backspace_can_scroll_up/screen:2')
+  App.screen.check(y, 'ghi', 'screen:2')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'jkl', 'F - test_backspace_can_scroll_up/screen:3')
+  App.screen.check(y, 'jkl', 'screen:3')
 end
 
 function test_backspace_can_scroll_up_screen_line()
-  io.write('\ntest_backspace_can_scroll_up_screen_line')
   -- display lines starting from second screen line of a line
   App.screen.init{width=Editor_state.left+30, height=60}
   Editor_state = edit.initialize_test_state()
@@ -1772,25 +1690,24 @@ function test_backspace_can_scroll_up_screen_line()
   Editor_state.screen_bottom1 = {}
   edit.draw(Editor_state)
   local y = Editor_state.top
-  App.screen.check(y, 'jkl', 'F - test_backspace_can_scroll_up_screen_line/baseline/screen:1')
+  App.screen.check(y, 'jkl', 'baseline/screen:1')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'mno', 'F - test_backspace_can_scroll_up_screen_line/baseline/screen:2')
+  App.screen.check(y, 'mno', 'baseline/screen:2')
   -- after hitting backspace the screen scrolls up by one screen line
   edit.run_after_keychord(Editor_state, 'backspace')
   y = Editor_state.top
-  App.screen.check(y, 'ghij', 'F - test_backspace_can_scroll_up_screen_line/screen:1')
+  App.screen.check(y, 'ghij', 'screen:1')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'kl', 'F - test_backspace_can_scroll_up_screen_line/screen:2')
+  App.screen.check(y, 'kl', 'screen:2')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'mno', 'F - test_backspace_can_scroll_up_screen_line/screen:3')
-  check_eq(Editor_state.screen_top1.line, 3, 'F - test_backspace_can_scroll_up_screen_line/screen_top')
-  check_eq(Editor_state.screen_top1.pos, 1, 'F - test_backspace_can_scroll_up_screen_line/screen_top')
-  check_eq(Editor_state.cursor1.line, 3, 'F - test_backspace_can_scroll_up_screen_line/cursor:line')
-  check_eq(Editor_state.cursor1.pos, 4, 'F - test_backspace_can_scroll_up_screen_line/cursor:pos')
+  App.screen.check(y, 'mno', 'screen:3')
+  check_eq(Editor_state.screen_top1.line, 3, 'screen_top:line')
+  check_eq(Editor_state.screen_top1.pos, 1, 'screen_top:pos')
+  check_eq(Editor_state.cursor1.line, 3, 'cursor:line')
+  check_eq(Editor_state.cursor1.pos, 4, 'cursor:pos')
 end
 
 function test_backspace_past_line_boundary()
-  io.write('\ntest_backspace_past_line_boundary')
   -- position cursor at start of a (non-first) line
   App.screen.init{width=Editor_state.left+30, height=60}
   Editor_state = edit.initialize_test_state()
@@ -1799,14 +1716,13 @@ function test_backspace_past_line_boundary()
   Editor_state.cursor1 = {line=2, pos=1}
   -- backspace joins with previous line
   edit.run_after_keychord(Editor_state, 'backspace')
-  check_eq(Editor_state.lines[1].data, 'abcdef', "F - test_backspace_past_line_boundary")
+  check_eq(Editor_state.lines[1].data, 'abcdef', 'check')
 end
 
 -- some tests for operating over selections created using Shift- chords
 -- we're just testing delete_selection, and it works the same for all keys
 
 function test_backspace_over_selection()
-  io.write('\ntest_backspace_over_selection')
   -- select just one character within a line with cursor before selection
   App.screen.init{width=Editor_state.left+30, height=60}
   Editor_state = edit.initialize_test_state()
@@ -1816,16 +1732,15 @@ function test_backspace_over_selection()
   Editor_state.selection1 = {line=1, pos=2}
   -- backspace deletes the selected character, even though it's after the cursor
   edit.run_after_keychord(Editor_state, 'backspace')
-  check_eq(Editor_state.lines[1].data, 'bc', "F - test_backspace_over_selection/data")
+  check_eq(Editor_state.lines[1].data, 'bc', 'data')
   -- cursor (remains) at start of selection
-  check_eq(Editor_state.cursor1.line, 1, "F - test_backspace_over_selection/cursor:line")
-  check_eq(Editor_state.cursor1.pos, 1, "F - test_backspace_over_selection/cursor:pos")
+  check_eq(Editor_state.cursor1.line, 1, 'cursor:line')
+  check_eq(Editor_state.cursor1.pos, 1, 'cursor:pos')
   -- selection is cleared
-  check_nil(Editor_state.selection1.line, "F - test_backspace_over_selection/selection")
+  check_nil(Editor_state.selection1.line, 'selection')
 end
 
 function test_backspace_over_selection_reverse()
-  io.write('\ntest_backspace_over_selection_reverse')
   -- select just one character within a line with cursor after selection
   App.screen.init{width=Editor_state.left+30, height=60}
   Editor_state = edit.initialize_test_state()
@@ -1835,16 +1750,15 @@ function test_backspace_over_selection_reverse()
   Editor_state.selection1 = {line=1, pos=1}
   -- backspace deletes the selected character
   edit.run_after_keychord(Editor_state, 'backspace')
-  check_eq(Editor_state.lines[1].data, 'bc', "F - test_backspace_over_selection_reverse/data")
+  check_eq(Editor_state.lines[1].data, 'bc', 'data')
   -- cursor moves to start of selection
-  check_eq(Editor_state.cursor1.line, 1, "F - test_backspace_over_selection_reverse/cursor:line")
-  check_eq(Editor_state.cursor1.pos, 1, "F - test_backspace_over_selection_reverse/cursor:pos")
+  check_eq(Editor_state.cursor1.line, 1, 'cursor:line')
+  check_eq(Editor_state.cursor1.pos, 1, 'cursor:pos')
   -- selection is cleared
-  check_nil(Editor_state.selection1.line, "F - test_backspace_over_selection_reverse/selection")
+  check_nil(Editor_state.selection1.line, 'selection')
 end
 
 function test_backspace_over_multiple_lines()
-  io.write('\ntest_backspace_over_multiple_lines')
   -- select just one character within a line with cursor after selection
   App.screen.init{width=Editor_state.left+30, height=60}
   Editor_state = edit.initialize_test_state()
@@ -1854,17 +1768,16 @@ function test_backspace_over_multiple_lines()
   Editor_state.selection1 = {line=4, pos=2}
   -- backspace deletes the region and joins the remaining portions of lines on either side
   edit.run_after_keychord(Editor_state, 'backspace')
-  check_eq(Editor_state.lines[1].data, 'akl', "F - test_backspace_over_multiple_lines/data:1")
-  check_eq(Editor_state.lines[2].data, 'mno', "F - test_backspace_over_multiple_lines/data:2")
+  check_eq(Editor_state.lines[1].data, 'akl', 'data:1')
+  check_eq(Editor_state.lines[2].data, 'mno', 'data:2')
   -- cursor remains at start of selection
-  check_eq(Editor_state.cursor1.line, 1, "F - test_backspace_over_multiple_lines/cursor:line")
-  check_eq(Editor_state.cursor1.pos, 2, "F - test_backspace_over_multiple_lines/cursor:pos")
+  check_eq(Editor_state.cursor1.line, 1, 'cursor:line')
+  check_eq(Editor_state.cursor1.pos, 2, 'cursor:pos')
   -- selection is cleared
-  check_nil(Editor_state.selection1.line, "F - test_backspace_over_multiple_lines/selection")
+  check_nil(Editor_state.selection1.line, 'selection')
 end
 
 function test_backspace_to_end_of_line()
-  io.write('\ntest_backspace_to_end_of_line')
   -- select region from cursor to end of line
   App.screen.init{width=Editor_state.left+30, height=60}
   Editor_state = edit.initialize_test_state()
@@ -1874,17 +1787,16 @@ function test_backspace_to_end_of_line()
   Editor_state.selection1 = {line=1, pos=4}
   -- backspace deletes rest of line without joining to any other line
   edit.run_after_keychord(Editor_state, 'backspace')
-  check_eq(Editor_state.lines[1].data, 'a', "F - test_backspace_to_start_of_line/data:1")
-  check_eq(Editor_state.lines[2].data, 'def', "F - test_backspace_to_start_of_line/data:2")
+  check_eq(Editor_state.lines[1].data, 'a', 'data:1')
+  check_eq(Editor_state.lines[2].data, 'def', 'data:2')
   -- cursor remains at start of selection
-  check_eq(Editor_state.cursor1.line, 1, "F - test_backspace_to_start_of_line/cursor:line")
-  check_eq(Editor_state.cursor1.pos, 2, "F - test_backspace_to_start_of_line/cursor:pos")
+  check_eq(Editor_state.cursor1.line, 1, 'cursor:line')
+  check_eq(Editor_state.cursor1.pos, 2, 'cursor:pos')
   -- selection is cleared
-  check_nil(Editor_state.selection1.line, "F - test_backspace_to_start_of_line/selection")
+  check_nil(Editor_state.selection1.line, 'selection')
 end
 
 function test_backspace_to_start_of_line()
-  io.write('\ntest_backspace_to_start_of_line')
   -- select region from cursor to start of line
   App.screen.init{width=Editor_state.left+30, height=60}
   Editor_state = edit.initialize_test_state()
@@ -1894,17 +1806,16 @@ function test_backspace_to_start_of_line()
   Editor_state.selection1 = {line=2, pos=3}
   -- backspace deletes beginning of line without joining to any other line
   edit.run_after_keychord(Editor_state, 'backspace')
-  check_eq(Editor_state.lines[1].data, 'abc', "F - test_backspace_to_start_of_line/data:1")
-  check_eq(Editor_state.lines[2].data, 'f', "F - test_backspace_to_start_of_line/data:2")
+  check_eq(Editor_state.lines[1].data, 'abc', 'data:1')
+  check_eq(Editor_state.lines[2].data, 'f', 'data:2')
   -- cursor remains at start of selection
-  check_eq(Editor_state.cursor1.line, 2, "F - test_backspace_to_start_of_line/cursor:line")
-  check_eq(Editor_state.cursor1.pos, 1, "F - test_backspace_to_start_of_line/cursor:pos")
+  check_eq(Editor_state.cursor1.line, 2, 'cursor:line')
+  check_eq(Editor_state.cursor1.pos, 1, 'cursor:pos')
   -- selection is cleared
-  check_nil(Editor_state.selection1.line, "F - test_backspace_to_start_of_line/selection")
+  check_nil(Editor_state.selection1.line, 'selection')
 end
 
 function test_undo_insert_text()
-  io.write('\ntest_undo_insert_text')
   App.screen.init{width=120, height=60}
   Editor_state = edit.initialize_test_state()
   Editor_state.lines = load_array{'abc', 'def', 'xyz'}
@@ -1915,32 +1826,31 @@ function test_undo_insert_text()
   -- insert a character
   edit.draw(Editor_state)
   edit.run_after_text_input(Editor_state, 'g')
-  check_eq(Editor_state.cursor1.line, 2, 'F - test_undo_insert_text/baseline/cursor:line')
-  check_eq(Editor_state.cursor1.pos, 5, 'F - test_undo_insert_text/baseline/cursor:pos')
-  check_nil(Editor_state.selection1.line, 'F - test_undo_insert_text/baseline/selection:line')
-  check_nil(Editor_state.selection1.pos, 'F - test_undo_insert_text/baseline/selection:pos')
+  check_eq(Editor_state.cursor1.line, 2, 'baseline/cursor:line')
+  check_eq(Editor_state.cursor1.pos, 5, 'baseline/cursor:pos')
+  check_nil(Editor_state.selection1.line, 'baseline/selection:line')
+  check_nil(Editor_state.selection1.pos, 'baseline/selection:pos')
   local y = Editor_state.top
-  App.screen.check(y, 'abc', 'F - test_undo_insert_text/baseline/screen:1')
+  App.screen.check(y, 'abc', 'baseline/screen:1')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'defg', 'F - test_undo_insert_text/baseline/screen:2')
+  App.screen.check(y, 'defg', 'baseline/screen:2')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'xyz', 'F - test_undo_insert_text/baseline/screen:3')
+  App.screen.check(y, 'xyz', 'baseline/screen:3')
   -- undo
   edit.run_after_keychord(Editor_state, 'C-z')
-  check_eq(Editor_state.cursor1.line, 2, 'F - test_undo_insert_text/cursor:line')
-  check_eq(Editor_state.cursor1.pos, 4, 'F - test_undo_insert_text/cursor:pos')
-  check_nil(Editor_state.selection1.line, 'F - test_undo_insert_text/selection:line')
-  check_nil(Editor_state.selection1.pos, 'F - test_undo_insert_text/selection:pos')
+  check_eq(Editor_state.cursor1.line, 2, 'cursor:line')
+  check_eq(Editor_state.cursor1.pos, 4, 'cursor:pos')
+  check_nil(Editor_state.selection1.line, 'selection:line')
+  check_nil(Editor_state.selection1.pos, 'selection:pos')
   y = Editor_state.top
-  App.screen.check(y, 'abc', 'F - test_undo_insert_text/screen:1')
+  App.screen.check(y, 'abc', 'screen:1')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'def', 'F - test_undo_insert_text/screen:2')
+  App.screen.check(y, 'def', 'screen:2')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'xyz', 'F - test_undo_insert_text/screen:3')
+  App.screen.check(y, 'xyz', 'screen:3')
 end
 
 function test_undo_delete_text()
-  io.write('\ntest_undo_delete_text')
   App.screen.init{width=120, height=60}
   Editor_state = edit.initialize_test_state()
   Editor_state.lines = load_array{'abc', 'defg', 'xyz'}
@@ -1950,35 +1860,34 @@ function test_undo_delete_text()
   Editor_state.screen_bottom1 = {}
   -- delete a character
   edit.run_after_keychord(Editor_state, 'backspace')
-  check_eq(Editor_state.cursor1.line, 2, 'F - test_undo_delete_text/baseline/cursor:line')
-  check_eq(Editor_state.cursor1.pos, 4, 'F - test_undo_delete_text/baseline/cursor:pos')
-  check_nil(Editor_state.selection1.line, 'F - test_undo_delete_text/baseline/selection:line')
-  check_nil(Editor_state.selection1.pos, 'F - test_undo_delete_text/baseline/selection:pos')
+  check_eq(Editor_state.cursor1.line, 2, 'baseline/cursor:line')
+  check_eq(Editor_state.cursor1.pos, 4, 'baseline/cursor:pos')
+  check_nil(Editor_state.selection1.line, 'baseline/selection:line')
+  check_nil(Editor_state.selection1.pos, 'baseline/selection:pos')
   local y = Editor_state.top
-  App.screen.check(y, 'abc', 'F - test_undo_delete_text/baseline/screen:1')
+  App.screen.check(y, 'abc', 'baseline/screen:1')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'def', 'F - test_undo_delete_text/baseline/screen:2')
+  App.screen.check(y, 'def', 'baseline/screen:2')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'xyz', 'F - test_undo_delete_text/baseline/screen:3')
+  App.screen.check(y, 'xyz', 'baseline/screen:3')
   -- undo
 --?   -- after undo, the backspaced key is selected
   edit.run_after_keychord(Editor_state, 'C-z')
-  check_eq(Editor_state.cursor1.line, 2, 'F - test_undo_delete_text/cursor:line')
-  check_eq(Editor_state.cursor1.pos, 5, 'F - test_undo_delete_text/cursor:pos')
-  check_nil(Editor_state.selection1.line, 'F - test_undo_delete_text/selection:line')
-  check_nil(Editor_state.selection1.pos, 'F - test_undo_delete_text/selection:pos')
---?   check_eq(Editor_state.selection1.line, 2, 'F - test_undo_delete_text/selection:line')
---?   check_eq(Editor_state.selection1.pos, 4, 'F - test_undo_delete_text/selection:pos')
+  check_eq(Editor_state.cursor1.line, 2, 'cursor:line')
+  check_eq(Editor_state.cursor1.pos, 5, 'cursor:pos')
+  check_nil(Editor_state.selection1.line, 'selection:line')
+  check_nil(Editor_state.selection1.pos, 'selection:pos')
+--?   check_eq(Editor_state.selection1.line, 2, 'selection:line')
+--?   check_eq(Editor_state.selection1.pos, 4, 'selection:pos')
   y = Editor_state.top
-  App.screen.check(y, 'abc', 'F - test_undo_delete_text/screen:1')
+  App.screen.check(y, 'abc', 'screen:1')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'defg', 'F - test_undo_delete_text/screen:2')
+  App.screen.check(y, 'defg', 'screen:2')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'xyz', 'F - test_undo_delete_text/screen:3')
+  App.screen.check(y, 'xyz', 'screen:3')
 end
 
 function test_undo_restores_selection()
-  io.write('\ntest_undo_restores_selection')
   -- display a line of text with some part selected
   App.screen.init{width=75, height=80}
   Editor_state = edit.initialize_test_state()
@@ -1991,18 +1900,17 @@ function test_undo_restores_selection()
   edit.draw(Editor_state)
   -- delete selected text
   edit.run_after_text_input(Editor_state, 'x')
-  check_eq(Editor_state.lines[1].data, 'xbc', 'F - test_undo_restores_selection/baseline')
-  check_nil(Editor_state.selection1.line, 'F - test_undo_restores_selection/baseline:selection')
+  check_eq(Editor_state.lines[1].data, 'xbc', 'baseline')
+  check_nil(Editor_state.selection1.line, 'baseline:selection')
   -- undo
   edit.run_after_keychord(Editor_state, 'C-z')
   edit.run_after_keychord(Editor_state, 'C-z')
   -- selection is restored
-  check_eq(Editor_state.selection1.line, 1, 'F - test_undo_restores_selection/line')
-  check_eq(Editor_state.selection1.pos, 2, 'F - test_undo_restores_selection/pos')
+  check_eq(Editor_state.selection1.line, 1, 'line')
+  check_eq(Editor_state.selection1.pos, 2, 'pos')
 end
 
 function test_search()
-  io.write('\ntest_search')
   App.screen.init{width=120, height=60}
   Editor_state = edit.initialize_test_state()
   Editor_state.lines = load_array{'```lines', '```', 'def', 'ghi', 'deg'}
@@ -2015,8 +1923,8 @@ function test_search()
   edit.run_after_keychord(Editor_state, 'C-f')
   edit.run_after_text_input(Editor_state, 'd')
   edit.run_after_keychord(Editor_state, 'return')
-  check_eq(Editor_state.cursor1.line, 2, 'F - test_search/1/cursor:line')
-  check_eq(Editor_state.cursor1.pos, 1, 'F - test_search/1/cursor:pos')
+  check_eq(Editor_state.cursor1.line, 2, '1/cursor:line')
+  check_eq(Editor_state.cursor1.pos, 1, '1/cursor:pos')
   -- reset cursor
   Editor_state.cursor1 = {line=1, pos=1}
   Editor_state.screen_top1 = {line=1, pos=1}
@@ -2025,12 +1933,11 @@ function test_search()
   edit.run_after_text_input(Editor_state, 'de')
   edit.run_after_keychord(Editor_state, 'down')
   edit.run_after_keychord(Editor_state, 'return')
-  check_eq(Editor_state.cursor1.line, 4, 'F - test_search/2/cursor:line')
-  check_eq(Editor_state.cursor1.pos, 1, 'F - test_search/2/cursor:pos')
+  check_eq(Editor_state.cursor1.line, 4, '2/cursor:line')
+  check_eq(Editor_state.cursor1.pos, 1, '2/cursor:pos')
 end
 
 function test_search_upwards()
-  io.write('\ntest_search_upwards')
   App.screen.init{width=120, height=60}
   Editor_state = edit.initialize_test_state()
   Editor_state.lines = load_array{'abc abd'}
@@ -2044,12 +1951,11 @@ function test_search_upwards()
   edit.run_after_text_input(Editor_state, 'a')
   -- search for previous occurrence
   edit.run_after_keychord(Editor_state, 'up')
-  check_eq(Editor_state.cursor1.line, 1, 'F - test_search_upwards/2/cursor:line')
-  check_eq(Editor_state.cursor1.pos, 1, 'F - test_search_upwards/2/cursor:pos')
+  check_eq(Editor_state.cursor1.line, 1, '2/cursor:line')
+  check_eq(Editor_state.cursor1.pos, 1, '2/cursor:pos')
 end
 
 function test_search_wrap()
-  io.write('\ntest_search_wrap')
   App.screen.init{width=120, height=60}
   Editor_state = edit.initialize_test_state()
   Editor_state.lines = load_array{'abc'}
@@ -2063,12 +1969,11 @@ function test_search_wrap()
   edit.run_after_text_input(Editor_state, 'a')
   edit.run_after_keychord(Editor_state, 'return')
   -- cursor wraps
-  check_eq(Editor_state.cursor1.line, 1, 'F - test_search_wrap/1/cursor:line')
-  check_eq(Editor_state.cursor1.pos, 1, 'F - test_search_wrap/1/cursor:pos')
+  check_eq(Editor_state.cursor1.line, 1, '1/cursor:line')
+  check_eq(Editor_state.cursor1.pos, 1, '1/cursor:pos')
 end
 
 function test_search_wrap_upwards()
-  io.write('\ntest_search_wrap_upwards')
   App.screen.init{width=120, height=60}
   Editor_state = edit.initialize_test_state()
   Editor_state.lines = load_array{'abc abd'}
@@ -2082,6 +1987,6 @@ function test_search_wrap_upwards()
   edit.run_after_text_input(Editor_state, 'a')
   edit.run_after_keychord(Editor_state, 'up')
   -- cursor wraps
-  check_eq(Editor_state.cursor1.line, 1, 'F - test_search_wrap_upwards/1/cursor:line')
-  check_eq(Editor_state.cursor1.pos, 5, 'F - test_search_wrap_upwards/1/cursor:pos')
+  check_eq(Editor_state.cursor1.line, 1, '1/cursor:line')
+  check_eq(Editor_state.cursor1.pos, 5, '1/cursor:pos')
 end