Adding partial support for ns, still failing the two round-trip tests