added some windows path handling and more tests