Limit change to windows and fix test to be accurate.