Code changes with code remarks
Removed getters and setters on DTO
Removed hierarhcical context from test that does not use it.