Added tests for Service layer