Updates including unit tests for Message, User and Organization