Updated the tests for the Service