Updated windows makefile & tests