Fixing broken WIndows unit tests for #129