Fix 2: make router test OS neutral