Added Unit Testing capabilities for Services