delivery service Tests and implementation changes.