Adding unit tests for service classes