Removed DTOs, added tests