Rename ServiceTest
Refactor service to add a container object