changing tests organization
turning message type into public attribute