fixed windows bug, minor changes to test