Fixed Windows bug and removed unnecessary test