Pass MSFTidy please
Minor fixes. Includes a test module.
Land #3082 - Release fixes