Another step on the path to Windows glory.
First two test suites pass in Darwin and Windows