Refactored Deice Service and Service Test to support DTOs with Generics