add tests to ensure that pickups/deliveries remain pickups/deliveries
add tests to ensure that pickups/deliveries remain pickups/deliveries