Fixed Test
New DTOs, refactored code to fit new calls to DTOs