Add support for Windows in makefile, update test scripts

Specifically when generating folders.
Also update the test scripts to work with new makefile structure