diff --git a/common b/common
index d08c857..18f0075 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit d08c85727a5e9aa5791f1fa2007533acfd6b0838
+Subproject commit 18f00751b5e5cb1b23c040a20bcf3f65aa667c49
diff --git a/test/run b/test/run
index 383bc07..7e38079 100755
--- a/test/run
+++ b/test/run
@@ -22,7 +22,6 @@ run_tests_no_pass
 run_tests_no_pass_altuid
 run_tests_no_root_altuid
 run_change_password_test
-run_doc_test
 run_bind_address_test
 run_no_bind_address_test
 "
@@ -217,11 +216,6 @@ test_scl_usage() {
   fi
 }
 
-run_doc_test() {
-  ct_doc_content_old 6379 "VALKEY.*PASSWORD" volume
-  return $?
-}
-
 function run_tests() {
   local name=$1 ; shift
   local ret
diff --git a/test/test_container_application.py b/test/test_container_application.py
index fdf86fc..afc7442 100644
--- a/test/test_container_application.py
+++ b/test/test_container_application.py
@@ -39,10 +39,8 @@ def test_run_app_test(self, password, test_name):
         assert self.s2i_app.create_container(
             cid_file_name=test_name, container_args=container_arg
         )
-        cid = self.s2i_app.get_cid(cid_file_name=test_name)
-        assert cid
-        cip = self.s2i_app.get_cip(cid_file_name=test_name)
-        assert cip
+        cip, cid = self.s2i_app.get_cip_cid(cid_file_name=test_name)
+        assert cip and cid
         testing_password = f"-a {password}" if password else ""
         valkey_cmd = f"valkey-cli -h {cip} {testing_password}"
         # Test with valkey-cli returns 'PONG' from the different container
@@ -101,10 +99,8 @@ def test_bind_address(self, bind_address):
             cid_file_name=cid_file_name,
             container_args=f"--user=100001 -e VALKEY_PASSWORD=pass {bind_address}",
         )
-        cid = self.s2i_app.get_cid(cid_file_name=cid_file_name)
-        assert cid
-        cip = self.s2i_app.get_cip(cid_file_name=cid_file_name)
-        assert cip
+        cip, cid = self.s2i_app.get_cip_cid(cid_file_name=cid_file_name)
+        assert cip and cid
         assert (
             PodmanCLIWrapper.podman_exec_shell_command(
                 cid_file_name=cid, cmd="test -f ${VALKEY_CONF}", return_output=False
diff --git a/test/test_container_basics.py b/test/test_container_basics.py
index 562291d..093365e 100644
--- a/test/test_container_basics.py
+++ b/test/test_container_basics.py
@@ -57,9 +57,8 @@ def test_run_change_password(self):
             cid_file_name=cid_file_name,
             container_args=f"-e VALKEY_PASSWORD=foo -v {data_dir}/data:/var/lib/valkey/data:Z",
         )
-        cid1 = self.app.get_cid(cid_file_name=cid_file_name)
-        cip1 = self.app.get_cip(cid_file_name=cid_file_name)
-        assert cip1
+        cip1, cid1 = self.app.get_cip_cid(cid_file_name=cid_file_name)
+        assert cip1 and cid1
         # The valkey-cli command should response with 'PONG'
         valkey_output = PodmanCLIWrapper.podman_run_command_and_remove(
             cid_file_name=VARS.IMAGE_NAME,
@@ -74,9 +73,8 @@ def test_run_change_password(self):
             cid_file_name=cid_file_name,
             container_args=f"-e VALKEY_PASSWORD=bar -v {data_dir}/data:/var/lib/valkey/data:Z",
         )
-        cid2 = self.app.get_cid(cid_file_name=cid_file_name)
-        cip2 = self.app.get_cip(cid_file_name=cid_file_name)
-        assert cip2
+        cip2, cid2 = self.app.get_cip_cid(cid_file_name=cid_file_name)
+        assert cip2 and cid2
         # The valkey-cli command should responds with 'PONG'
         valkey_output = PodmanCLIWrapper.podman_run_command_and_remove(
             cid_file_name=VARS.IMAGE_NAME, cmd=f"valkey-cli -h {cip2} -a bar ping"