messaging improvements : fixed tests