#492: add new rules, change tests