match SampleDataGenerator and DatabaseTest with new Delivery model