DISPATCH-451: Incorporate review comments; add self tests
9 files changed