Pass implemented, code generalized
Some tests cleanup
MessageManagerMock and others.