More tests passing
All tests pass in Windows and Unix-like systems