Merge "Remove usage of -moduleName in CLI test" into main