DAR-1405 Additional changes to unit test after code review