Add delivery and encoding tests