Fix x64 Windows Debug build

Manifest file was specifying comctl32 x86.  This way seems to make everyone happy.

Also sneak in a test.py fix and a buildfix.

-[Unknown]