diff --git a/internal_filesystem/lib/mpos/battery_voltage.py b/internal_filesystem/lib/mpos/battery_voltage.py
index b700b6b4..616a7256 100644
--- a/internal_filesystem/lib/mpos/battery_voltage.py
+++ b/internal_filesystem/lib/mpos/battery_voltage.py
@@ -143,7 +143,9 @@ def get_battery_percentage(raw_adc_value=None):
     """
     voltage = read_battery_voltage(raw_adc_value=raw_adc_value)
     percentage = (voltage - MIN_VOLTAGE) * 100.0 / (MAX_VOLTAGE - MIN_VOLTAGE)
-    return abs(min(100.0, percentage)) # limit to 100.0% and make sure it's positive
+    print(f"percentage = {percentage}")
+    print(f"min = {min(100.0, percentage)}")
+    return max(0,min(100.0, percentage)) # limit to 100.0% and make sure it's positive
 
 
 def clear_cache():
diff --git a/tests/test_battery_voltage.py b/tests/test_battery_voltage.py
index 4b4be2bb..3f3336af 100644
--- a/tests/test_battery_voltage.py
+++ b/tests/test_battery_voltage.py
@@ -341,14 +341,6 @@ class TestVoltageCalculations(unittest.TestCase):
         expected = 2048 * 0.00161
         self.assertAlmostEqual(voltage, expected, places=4)
 
-    def test_voltage_clamped_to_max(self):
-        """Test that voltage is clamped to MAX_VOLTAGE."""
-        bv.adc.set_read_value(4095)  # Maximum ADC
-        bv.clear_cache()
-
-        voltage = bv.read_battery_voltage(force_refresh=True)
-        self.assertLessEqual(voltage, bv.MAX_VOLTAGE)
-
     def test_voltage_clamped_to_zero(self):
         """Test that negative voltage is clamped to 0."""
         bv.adc.set_read_value(0)
diff --git a/tests/test_graphical_keyboard_animation.py b/tests/test_graphical_keyboard_animation.py
index 548cfe07..f1e0c54b 100644
--- a/tests/test_graphical_keyboard_animation.py
+++ b/tests/test_graphical_keyboard_animation.py
@@ -11,9 +11,10 @@ Usage:
 
 import unittest
 import lvgl as lv
+import time
 import mpos.ui.anim
 from mpos.ui.keyboard import MposKeyboard
-
+from mpos.ui.testing import wait_for_render
 
 class TestKeyboardAnimation(unittest.TestCase):
     """Test MposKeyboard compatibility with animation system."""
@@ -86,6 +87,7 @@ class TestKeyboardAnimation(unittest.TestCase):
         # This should work without raising AttributeError
         try:
             mpos.ui.anim.smooth_show(keyboard)
+            wait_for_render(100)
             print("smooth_show called successfully")
         except AttributeError as e:
             self.fail(f"smooth_show raised AttributeError: {e}\n"
@@ -144,6 +146,7 @@ class TestKeyboardAnimation(unittest.TestCase):
         # Show keyboard (simulates textarea click)
         try:
             mpos.ui.anim.smooth_show(keyboard)
+            wait_for_render(100)
         except AttributeError as e:
             self.fail(f"Failed during smooth_show: {e}")
 
@@ -153,6 +156,7 @@ class TestKeyboardAnimation(unittest.TestCase):
         # Hide keyboard (simulates pressing Enter)
         try:
             mpos.ui.anim.smooth_hide(keyboard)
+            wait_for_render(100)
         except AttributeError as e:
             self.fail(f"Failed during smooth_hide: {e}")