Fix packages specs on CI

This updates the remaining failing specs to pass on the Windows CI machine.

Unfortunately I still don't know why they failed, they passed on both my Windows 8 vm and on a Windows 8 Samsung Ultrabook.

So instead the specs were massaged a bit to get them passing consistently but functionally be the same.