diff --git a/plugins/PaintTool/PaintTool.qml b/plugins/PaintTool/PaintTool.qml
index 8548c3c14e..2f96bffd24 100644
--- a/plugins/PaintTool/PaintTool.qml
+++ b/plugins/PaintTool/PaintTool.qml
@@ -327,7 +327,7 @@ Item
         UM.Label
         {
             anchors.fill: parent
-            text: catalog.i18nc("@label", "Select a single model to start painting")
+            text: catalog.i18nc("@label", "Select a single ungrouped model to start painting")
             verticalAlignment: Text.AlignVCenter
             horizontalAlignment: Text.AlignHCenter
         }
diff --git a/resources/definitions/anycubic_i3_mega_s.def.json b/resources/definitions/anycubic_i3_mega_s.def.json
index 6db0164241..c7c2dd1f4d 100644
--- a/resources/definitions/anycubic_i3_mega_s.def.json
+++ b/resources/definitions/anycubic_i3_mega_s.def.json
@@ -39,7 +39,7 @@
         "machine_acceleration": { "value": 3000 },
         "machine_center_is_zero": { "default_value": false },
         "machine_depth": { "default_value": 210 },
-        "machine_end_gcode": { "default_value": "M104 S0                                    ; Extruder off \nM140 S0                                    ; Heatbed off \nM107                                       ; Fan off \nG91                                        ; relative positioning \nG1 E-5 F300                                ; retract a little \nG1 Z+10 E-5 ; X-20 Y-20 F{travel_xy_speed} ; lift print head \nG28 X0 Y0                                  ; homing \nG1 Y180 F2000                              ; reset feedrate \nM84                                        ; disable stepper motors \nG90                                        ; absolute positioning \nM300 S440 P200                             ; Make Print Completed Tones \nM300 S660 P250                             ; beep \nM300 S880 P300                             ; beep" },
+        "machine_end_gcode": { "default_value": "M104 S0                                    ; Extruder off \nM140 S0                                    ; Heatbed off \nM107                                       ; Fan off \nG91                                        ; relative positioning \nG1 E-5 F300                                ; retract a little \nG1 Z+10 E-5 ; X-20 Y-20 F{speed_travel} ; lift print head \nG28 X0 Y0                                  ; homing \nG1 Y180 F2000                              ; reset feedrate \nM84                                        ; disable stepper motors \nG90                                        ; absolute positioning \nM300 S440 P200                             ; Make Print Completed Tones \nM300 S660 P250                             ; beep \nM300 S880 P300                             ; beep" },
         "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
         "machine_heated_bed": { "default_value": true },
         "machine_height": { "default_value": 205 },
diff --git a/tests/conftest.py b/tests/conftest.py
index 377a525ba7..6f69b5df53 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -21,6 +21,12 @@ from UM.Settings.ContainerRegistry import ContainerRegistry
 @pytest.fixture()
 def application() -> CuraApplication:
     app = MagicMock()
+    app.getInstance = MagicMock(return_value=app)
+    machine_manager = MagicMock()
+    extruder_changed_signal = MagicMock()
+    extruder_changed_signal.connect = MagicMock()
+    machine_manager.extruderChanged = extruder_changed_signal
+    app.getMachineManager = MagicMock(return_value=machine_manager)
     return app
 
 @pytest.fixture()