FEND-563: fixed failing unit test and refactor setCommonData