Refactor domain object to make more generic. Populate all attributes from test message. Add unit tests