Support windows & IE, make tests pass