Fixing broken test caused by new releases of test libraries.
Merge pull request #3090 from ehelms/test-fix

Fixing broken test caused by new releases of test libraries.
1014827: Being more explicit with unit_key and unit_metadata