Fix PromotionEligibilityChecker, fix specs
Merge pull request #1913 from stloyd/bugfix/spec_promo

Fix PromotionEligibilityChecker, fix specs