Update update_merge.bat

Update update_merge.bat to use the new structure of the testset files