Improvements to ParameterCountRuleTest