message key should take isModification into account
Revert "get rid of failing test class"

This reverts commit b38d3cd66d2ef0f87b8a74094884b8ddbd3ab751.
reenable test