refactor message mapper tests