Update WIN32 makefile for renamed tests