   lcd.print("klmn");
   wait(160);
 
-  // Test that the screen can really hold 40 characters on each line,
-  // and that it can display the last 4 columns with the first 4 columns.
+  // Test that the screen can really hold 40 characters on each
+  // line, and that it can display the last 4 columns with the
+  // first 4 columns.
   // Expected screen: "!@#$abcd"
   //                  "%^&*ABCD"
-  lcd.clear();
-  lcd.print("abcdefghijklmnopqrstuvwxyz0123456789!@#$--");
+  // (with a blinking cursor over the a)
+  lcd.clear();
+  lcd.print("abcdefghijklmnopqrstuvwxyz0123456789!@#$");
   lcd.gotoLine(1);
-  lcd.print("ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789%^&*--");
+  lcd.print("ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789%^&*");
   lcd.scrollDisplayRight();
   lcd.scrollDisplayRight();
   lcd.scrollDisplayRight();


void setup()
{
  loadCustomCharacters();
}

// Prints the ID of the screen we are currently showing and waits for
// the user to send input on the serial monitor before continuing.
void wait(uint16_t id)
{
  SERIAL_PORT_MONITOR.println(id);

  wait(90);

  // Test scrollDisplayLeft.
  // Expected screen: "i there "
  //                  "23456789"
  // (with a blinking cursor on the second column, top row)
  lcd.scrollDisplayLeft();
  wait(100);

  // Test scrollDisplayLeft.
  // Expected screen: " there  "
  //                  "3456789a"
  // (with a blinking cursor on the first column, top row)
  lcd.scrollDisplayLeft();
  wait(110);

  // Test scrollDisplayRight.
  // Expected screen: "i there "
  //                  "23456789"
  // (with a blinking cursor on the second column, top row)
  lcd.scrollDisplayRight();
  wait(120);

  // Test home.
  // Expected screen: "Hi there"
  //                  "12345678"
  // (with a blinking cursor on the H)
  lcd.home();
  wait(130);

  // Test clear().  The screen should be empty except for a
  // blinking cursor in the upper left.
  lcd.clear();
  wait(140);

  // Test leftToRight and rightToLeft
  // Expected screen: "abcdef  "
  //                  "        "
  // (with a blinking cursor)
  lcd.print("abXX");
  lcd.rightToLeft();
  lcd.print("Xdc");
