add new rules and tests, unify properties