Remove duplicated factories
[#68239646] One Shipping Per Subscription

* Adds sotck splitter address spec
* Refactor comments from @efigarolam