Update to ||_tests with better Windows detection