Fix test.bat to latest test format