Remove bad file for Windows, change tests