Continued working on DTOs + Testing