XD-928: Refactor DelegatingModuleRegistryTests
XD-928 Polishing

- Use a different package name to avoid "the type collides with a package" warning
- Fix type safety warnings