fixing rules related test failures