modify test nsstream
fix conflict