Fixed windows and safari detection
 - All tests now passing