More unit test updated for data toolbar
CORE-5300