Fix merging the fs extras, fix tests for Windows