Refactor expected message params