Restore service tests

Fixing the service layer tests which had broken due to changes in the underlying mock data.  Addresses #22