WIP refactor message field and test.