Fix windows tests

Includes things mentioned in #3. 
I tested on mac & windows with node 0.10.33.