fixed test merge errors
added DistributionRules model