#156: Fixing itest on windows.
#156: Fixing itest on windows.
#156: Removed cruft
#156: Removed cruft