refactoring + Functional tests: ManageRulesTest: 5.1.5-5.16