Worked on stabilizing and modernizing the ModuleChoice workflow in the chipsalliance/chisel repository, focusing on improving integration with module definitions and enhancing testing practices. Refactored the ModuleChoice feature to ensure options and groups propagate correctly across modules, addressing edge-case failures under dependency/injection contexts. Introduced FileCheck-based verification for generated FIRRTL, which increased test coverage and improved regression detection. Used Scala and hardware description languages to clarify module definitions and streamline the workflow. These changes enhanced the reliability and maintainability of the module selection mechanism, resulting in fewer regressions and supporting faster, more robust development within the Chisel codebase.