Adding tests for the service layer