Remove extra copy of data from testcase
Fix refresh issues with elements