Improving service tests
Finishing service model tests