New tests + refactoring Message classes