#525: add new rules anc change tests