Additions to/preparations for CartService. Tweaks to data model. Added self-documentation for models for easier testing. Added test data.