Clarify message resolution and add tests

Signed-off-by: Clement Escoffier <clement.escoffier@gmail.com>