Add name, prepare test filename to be Windows-friendly