Storing and passing ServiceUri. Tests fixes.