Minor test cleanup for windows.