#526: add new rules and tests