Fix regressions in unit test merge

Unit tests failed to run when Ming is available. This was
not caught in Jenkins because Ming has been removed from
test-requirements.

Change-Id: I048e614046071da8038e5e43815fbb7596106c6f
Merge "Fix regressions in unit test merge" into stable/grizzly