Minor debug code change + test dir changes.
Stop trying to avoid having PHP a part of the packege for Windows...