Ensure correct connect and disconnect functionality

• Connecting to the same URI is currently restricted. Check if this restriction is necessary, and remove it if not
• Disconnect is untested so far. Add tests, and check if it works as expected