further fixes and passing tests in messaging