WIP updating tests to new code structure before implementing DiscountSetGenerator or similar