added more tests to verify that we create the correct nr of deliveries.
cleanup callbacks for the order