Updated tests to work with updated RuleSet class