add new rules and tests