changes on Rules and RulesTest