Unit test changes for wheel_setuptools_support
Merged changes from upstream