Fix unittests broken by prior rename.  This indicates a prior QA lapse.