#484: fix rules and tests