Removed test image, since that can go in the test project
Added ability to build on windows