FIX: Minor fixes to clean up tests in windows

Just some minor tweaks I wanted to have in place when coding in Windows on Python3. I have an issue running the scripts, but that one will be harder to fix.