add delivery tests and mocks