Adding specific messages for consumer/provider different cases + TESTS