Write tests for move from a VendProd with a prod and a prep to prodprep
Change VendorProduct to use ProductPreparation model
Rebase feature/16737 off of develop