More ModuleId changes.
Fix unit test.