* Use server namespaces uri to identify namepsace index for node imports (2)

* Fixes test failures / Add unittest

* Add unittest (2)