add new rules and tests, remove duplicate rules