Updated message parsers, added tests