Adds full test coverage for delivery model
Merge pull request #74 from taylorzr/delivery-model-tests

Adds full test coverage for delivery model