Add listener methods.  Fix test annoyances.