Updating parsing of raw message, tests now pass