Revert regex change, add manual test for win32 zip