fix a FIXME. minor refactoring.
remove a comment. improve message delivery tests.