Added more Service DTO validation, and Unit Tests