Updates to fix module_registry_spec