Revert "Split handling of inbound, outbound, and acknowledgement messages."

This reverts commit de68abc935fa6f3165f3f6dbe86839bdd8fbfe1d.
Make tests less dependent on implementation details.