#525: add new rules, change tests