Fixed tests failing with the change of "message" to "@message"