Merge pull request #9836 from s0undt3ch/develop

Use the required `__virtualname__` if renaming the module.
Fix unit test expected results since we now exit with an error code.
Fix unit test expected results since we now exit with an error code.
Fix unit test expected results since we now exit with an error code.
Fix unit test expected results since we now exit with an error code.
Fix unit test expected results since we now exit with an error code.
Fix unit test expected results since we now exit with an error code.