More unit test updated for data toolbar
CORE-5300
Wiring up last of refactor
CORE-5300
Corrected unit test failures
CORE-5300