#525: add new rules and change tests