Refactor type service unit tests to test DTOs separately