#484: add new rules and tests