Added messages method and tests