Updated Tests To Pass Under Windows