fixing up match validator
adding reverts-after-change tests