Cleaning up testing some more.  Right now, there is a broken test but
this commit is basically a checkpoint before re-thinking how I test for
events.  This might involve re-working listeners.