Closes #3308. Thanks for fixing the misleading Windows status diagnostic and adding the focused regression tests.