Refactor message and add test item