Made everything work on Windows.
Also eliminated most copy-paste in testing code
and started to enforce PEP8.