More functionality and tests in the Service