clean up for W-1486796, update tests as well
@bug W-2039412@
@rev goliver@
@rev rjayaramappa@@
Merging origin/lin/master-pending/clean-up-for-W-1486796-update-test into master