PRD-3912, PRD-4922 - Refresh order for data-items validated/fixed

PRD-3912 - added a proper test case
PRD-4922 - added a test case and fixed event order.