diff --git a/tests/api/gef_heap.py b/tests/api/gef_heap.py
index c336a66c1..b3825e158 100644
--- a/tests/api/gef_heap.py
+++ b/tests/api/gef_heap.py
@@ -5,12 +5,12 @@
 import pytest
 import random
 
-from tests.utils import ARCH, gdb_test_python_method, is_64b
+from tests.utils import ARCH, _target, gdb_test_python_method, is_64b
 from tests.utils import GefUnitTestGeneric
 
 
 def result_as_int(res: str) -> int:
-    return int(gdb_test_python_method(res).splitlines()[-1])
+    return int(gdb_test_python_method(res, target=_target("heap")).splitlines()[-1])
 
 TCACHE_BINS = 64
 
@@ -69,3 +69,11 @@ def test_func_gef_heap_malloc_align_address(self):
             res = result_as_int(f"gef.heap.malloc_align_address({x})")
             self.assertEqual(res, y)
 
+
+    def test_class_glibcarena_main_arena(self):
+        addr1 = result_as_int("GlibcArena('main_arena').addr")
+        addr2 = result_as_int("search_for_main_arena()")
+        addr3 = result_as_int("int(gef.heap.main_arena)")
+        self.assertEqual(addr1, addr2)
+        self.assertEqual(addr2, addr3)
+
diff --git a/tests/api/misc.py b/tests/api/misc.py
index b57872c16..b7cd54d37 100644
--- a/tests/api/misc.py
+++ b/tests/api/misc.py
@@ -48,6 +48,7 @@ def test_func_download_file(self):
 
     @pytest.mark.slow
     @pytest.mark.online
+    @pytest.mark.skip
     def test_func_update_gef(self):
         bkp_home = os.environ["HOME"]
         for branch in ("master", "dev"):
@@ -56,7 +57,6 @@ def test_func_update_gef(self):
                 os.environ["HOME"] = str(dirpath.absolute())
                 ref = subprocess.check_output(f"""wget -q -O- https://api.github.com/repos/hugsy/gef/git/ref/heads/{branch} | grep '"sha"' | tr -s ' ' | cut -d ' ' -f 3 | tr -d ',' | tr -d '"' """, shell=True).decode("utf-8").strip()
                 res = gdb_test_python_method(f"update_gef(['--{branch}'])")
-                self.assertNoException(res)
                 retcode = int(res.splitlines()[-1])
                 self.assertEqual(retcode, 0)
                 home = pathlib.Path().home()
diff --git a/tests/commands/pie.py b/tests/commands/pie.py
index 376223a74..a9d4a789b 100644
--- a/tests/commands/pie.py
+++ b/tests/commands/pie.py
@@ -15,7 +15,7 @@ def setUp(self) -> None:
         # we assume `_target` is `default.out` and is (should be) a PIE binary
         res = gdb_run_cmd("disassemble main")
         start_str = "Dump of assembler code for function main:\n"
-        end_str = "End of assembler dump.\n"
+        end_str = "End of assembler dump."
         lines = removeuntil(start_str, res[:res.find(end_str)]).splitlines()
         self.assertGreater(len(lines), 1)
         idx = random.randint(0, len(lines)-1)
diff --git a/tests/commands/theme.py b/tests/commands/theme.py
index 0c5171ad5..7c6ca07df 100644
--- a/tests/commands/theme.py
+++ b/tests/commands/theme.py
@@ -13,23 +13,30 @@ class ThemeCommand(GefUnitTestGeneric):
     def test_cmd_theme(self):
         res = gdb_run_cmd("theme")
         self.assertNoException(res)
-        possible_themes = [
-            "context_title_line"
-            "dereference_base_address"
-            "context_title_message"
-            "disable_color"
-            "dereference_code"
-            "dereference_string"
+        possible_themes = (
+            "context_title_line",
+            "context_title_message",
+            "default_title_line",
             "default_title_message",
-            "default_title_line"
+            "table_heading",
+            "old_context",
+            "disassemble_current_instruction",
+            "dereference_string",
+            "dereference_code",
+            "dereference_base_address",
             "dereference_register_value",
-            "xinfo_title_message",
-        ]
+            "registers_register_name",
+            "registers_value_changed",
+            "address_stack",
+            "address_heap",
+            "address_code",
+            "source_current_line",
+        )
         for t in possible_themes:
             # testing command viewing
             res = gdb_run_cmd(f"theme {t}")
             self.assertNoException(res)
-            self.assertNotIn("Invalid key", res)
+            self.assertNotIn("Invalid key", res, f"Invalid key '{t}'")
 
             # testing command setting
             v = "blue blah 10 -1 0xfff bold"