This requires some refactoring to move the relevant message generation to test-display.scm. svn: r14668