[#516 Passes coverage limits and removes redundant DTO