Extend and rework assertion rule