diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index 7a1c70b..4bb2697 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -13,6 +13,39 @@
         </DropdownSelection>
         <DialogSelection />
       </SelectionState>
+      <SelectionState runConfigName="androidTest">
+        <option name="selectionMode" value="DROPDOWN" />
+        <DropdownSelection timestamp="2026-05-06T11:33:57.804357Z">
+          <Target type="DEFAULT_BOOT">
+            <handle>
+              <DeviceId pluginId="PhysicalDevice" identifier="serial=b93659d0e5dd" />
+            </handle>
+          </Target>
+        </DropdownSelection>
+        <DialogSelection />
+      </SelectionState>
+      <SelectionState runConfigName="main">
+        <option name="selectionMode" value="DROPDOWN" />
+        <DropdownSelection timestamp="2026-05-06T11:33:57.804357Z">
+          <Target type="DEFAULT_BOOT">
+            <handle>
+              <DeviceId pluginId="PhysicalDevice" identifier="serial=b93659d0e5dd" />
+            </handle>
+          </Target>
+        </DropdownSelection>
+        <DialogSelection />
+      </SelectionState>
+      <SelectionState runConfigName="unitTest">
+        <option name="selectionMode" value="DROPDOWN" />
+        <DropdownSelection timestamp="2026-05-06T11:33:57.804357Z">
+          <Target type="DEFAULT_BOOT">
+            <handle>
+              <DeviceId pluginId="PhysicalDevice" identifier="serial=b93659d0e5dd" />
+            </handle>
+          </Target>
+        </DropdownSelection>
+        <DialogSelection />
+      </SelectionState>
     </selectionStates>
   </component>
 </project>
\ No newline at end of file
diff --git a/app/src/main/java/com/example/cuida/ui/medication/MedicationDialog.java b/app/src/main/java/com/example/cuida/ui/medication/MedicationDialog.java
index 84af82c..0fa0135 100644
--- a/app/src/main/java/com/example/cuida/ui/medication/MedicationDialog.java
+++ b/app/src/main/java/com/example/cuida/ui/medication/MedicationDialog.java
@@ -158,7 +158,7 @@ public class MedicationDialog extends DialogFragment {
             builder.setTitle("Adicionar Medicamento");
             // Default time to current time
             Calendar cal = Calendar.getInstance();
-            String defaultTime = String.format(Locale.getDefault(), "%02d:%02d", cal.get(Calendar.HOUR_OF_DAY), cal.get(Calendar.MINUTE));
+            String defaultTime = String.format(Locale.US, "%02d:%02d", cal.get(Calendar.HOUR_OF_DAY), cal.get(Calendar.MINUTE));
             selectedTimes.add(defaultTime);
             refreshTimeChips();
         }
@@ -272,7 +272,7 @@ public class MedicationDialog extends DialogFragment {
 
         TimePickerDialog timePickerDialog = new TimePickerDialog(getContext(),
                 (view, hourOfDay, minute1) -> {
-                    String time = String.format(Locale.getDefault(), "%02d:%02d", hourOfDay, minute1);
+                    String time = String.format(Locale.US, "%02d:%02d", hourOfDay, minute1);
                     if (!selectedTimes.contains(time)) {
                         selectedTimes.add(time);
                         Collections.sort(selectedTimes);
diff --git a/app/src/main/java/com/example/cuida/ui/schedule/ScheduleViewModel.java b/app/src/main/java/com/example/cuida/ui/schedule/ScheduleViewModel.java
index f5f1f4f..1e4b1c0 100644
--- a/app/src/main/java/com/example/cuida/ui/schedule/ScheduleViewModel.java
+++ b/app/src/main/java/com/example/cuida/ui/schedule/ScheduleViewModel.java
@@ -84,7 +84,7 @@ public class ScheduleViewModel extends AndroidViewModel {
     }
 
     public void setDate(int year, int month, int dayOfMonth) {
-        String date = String.format("%02d/%02d/%04d", dayOfMonth, month + 1, year);
+        String date = String.format(java.util.Locale.US, "%02d/%02d/%04d", dayOfMonth, month + 1, year);
         selectedDate.setValue(date);
         loadTimeSlots(date);
     }
@@ -216,7 +216,7 @@ public class ScheduleViewModel extends AndroidViewModel {
         boolean isToday = false;
 
         if (selectedDateStr != null) {
-            String todayStr = String.format("%02d/%02d/%04d",
+            String todayStr = String.format(java.util.Locale.US, "%02d/%02d/%04d",
                     now.get(Calendar.DAY_OF_MONTH),
                     now.get(Calendar.MONTH) + 1,
                     now.get(Calendar.YEAR));
@@ -250,7 +250,7 @@ public class ScheduleViewModel extends AndroidViewModel {
                 continue;
             }
 
-            String timeStr = String.format("%02d:%02d", h, m);
+            String timeStr = String.format(java.util.Locale.US, "%02d:%02d", h, m);
 
             if (!isToday || h > currentHour || (h == currentHour && m > currentMinute)) {
                 addSlot(slots, timeStr, bookedTimes);
diff --git a/gradle.properties b/gradle.properties
index 250afc3..944c65a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -10,3 +10,4 @@ android.r8.strictFullModeForKeepRules=false
 android.r8.optimizedResourceShrinking=false
 android.builtInKotlin=false
 android.newDsl=false
+org.gradle.jvmargs=-Xmx2048m -XX:MaxMetaspaceSize=512m
diff --git a/java_pid1336.hprof b/java_pid1336.hprof
deleted file mode 100644
index e2bcd26..0000000
Binary files a/java_pid1336.hprof and /dev/null differ
diff --git a/java_pid14727.hprof b/java_pid14727.hprof
deleted file mode 100644
index 87790f2..0000000
Binary files a/java_pid14727.hprof and /dev/null differ
diff --git a/java_pid1614.hprof b/java_pid1614.hprof
deleted file mode 100644
index 5160e5e..0000000
Binary files a/java_pid1614.hprof and /dev/null differ
diff --git a/java_pid1755.hprof b/java_pid1755.hprof
deleted file mode 100644
index cb4a548..0000000
Binary files a/java_pid1755.hprof and /dev/null differ