Added test for service layer