diff --git a/core/core_bind.cpp b/core/core_bind.cpp
index 9bdd6a77..5a44ada8 100644
--- a/core/core_bind.cpp
+++ b/core/core_bind.cpp
@@ -1461,6 +1461,7 @@ void ClassDB::get_argument_options(const StringName &p_function, int p_idx, List
 }
 #endif
 
+
 void ClassDB::_bind_methods() {
 	::ClassDB::bind_method(D_METHOD("get_class_list"), &ClassDB::get_class_list);
 	::ClassDB::bind_method(D_METHOD("get_inheriters_from_class", "class"), &ClassDB::get_inheriters_from_class);
diff --git a/modules/gdscript/tests/scripts/.editorconfig b/modules/gdscript/tests/scripts/.editorconfig
new file mode 100644
index 00000000..f28239ba
--- /dev/null
+++ b/modules/gdscript/tests/scripts/.editorconfig
@@ -0,0 +1,4 @@
+root = true
+
+[*]
+charset = utf-8
diff --git a/modules/gdscript/tests/scripts/analyzer/features/boolean_operators_for_all_types.gd b/modules/gdscript/tests/scripts/analyzer/features/boolean_operators_for_all_types.gd
index 78e631a4..373146d8 100644
--- a/modules/gdscript/tests/scripts/analyzer/features/boolean_operators_for_all_types.gd
+++ b/modules/gdscript/tests/scripts/analyzer/features/boolean_operators_for_all_types.gd
@@ -157,15 +157,6 @@ func test():
 	prints(x or false)
 	prints(x or true)
 
-	# TYPE_TRANSFORM3D
-	x = Transform3D.IDENTITY
-	prints("TYPE_TRANSFORM3D")
-	prints(not x)
-	prints(x and false)
-	prints(x and true)
-	prints(x or false)
-	prints(x or true)
-
 	# TYPE_PROJECTION
 	x = Projection.IDENTITY
 	prints("TYPE_PROJECTION")
diff --git a/modules/gdscript/tests/scripts/analyzer/features/boolean_operators_for_all_types.out b/modules/gdscript/tests/scripts/analyzer/features/boolean_operators_for_all_types.out
index e2999fab..55be7b7b 100644
--- a/modules/gdscript/tests/scripts/analyzer/features/boolean_operators_for_all_types.out
+++ b/modules/gdscript/tests/scripts/analyzer/features/boolean_operators_for_all_types.out
@@ -101,12 +101,6 @@ false
 false
 false
 true
-TYPE_TRANSFORM3D
-true
-false
-false
-false
-true
 TYPE_PROJECTION
 true
 false
diff --git a/modules/gdscript/tests/scripts/runtime/features/chain_assignment_works.gd b/modules/gdscript/tests/scripts/runtime/features/chain_assignment_works.gd
index d2f3a3e1..5333e2ba 100644
--- a/modules/gdscript/tests/scripts/runtime/features/chain_assignment_works.gd
+++ b/modules/gdscript/tests/scripts/runtime/features/chain_assignment_works.gd
@@ -9,11 +9,8 @@ func test():
 	array2[0][0].x = 6
 	var array3: Array[Array] = [[Vector2()]]
 	array3[0][0].x = 7
-	var transform = Transform3D()
-	transform.basis.x = Vector3(8.0, 9.0, 7.0)
 	print(dictionary1)
 	print(dictionary2)
 	print(array1)
 	print(array2)
 	print(array3)
-	print(transform)
diff --git a/modules/gdscript/tests/scripts/runtime/features/compare_builtin_equals_null.gd b/modules/gdscript/tests/scripts/runtime/features/compare_builtin_equals_null.gd
index 74070cf8..1959d2ac 100644
--- a/modules/gdscript/tests/scripts/runtime/features/compare_builtin_equals_null.gd
+++ b/modules/gdscript/tests/scripts/runtime/features/compare_builtin_equals_null.gd
@@ -61,10 +61,6 @@ func test():
 	value = Basis()
 	print(value == null)
 
-	# Transform3D
-	value = Transform3D()
-	print(value == null)
-
 	# Projection
 	value = Projection()
 	print(value == null)
@@ -136,7 +132,3 @@ func test():
 	# PackedColorArray
 	value = PackedColorArray()
 	print(value == null)
-
-	# PackedVector4Array
-	value = PackedVector4Array()
-	print(value == null)
diff --git a/modules/gdscript/tests/scripts/runtime/features/compare_builtin_not_equals_null.gd b/modules/gdscript/tests/scripts/runtime/features/compare_builtin_not_equals_null.gd
index ed0a300f..dbc6cb6a 100644
--- a/modules/gdscript/tests/scripts/runtime/features/compare_builtin_not_equals_null.gd
+++ b/modules/gdscript/tests/scripts/runtime/features/compare_builtin_not_equals_null.gd
@@ -61,10 +61,6 @@ func test():
 	value = Basis()
 	print(value != null)
 
-	# Transform3D
-	value = Transform3D()
-	print(value != null)
-
 	# Projection
 	value = Projection()
 	print(value != null)
@@ -136,7 +132,3 @@ func test():
 	# PackedColorArray
 	value = PackedColorArray()
 	print(value != null)
-
-	# PackedVector4Array
-	value = PackedVector4Array()
-	print(value != null)
diff --git a/modules/gdscript/tests/scripts/runtime/features/compare_null_equals_builtin.gd b/modules/gdscript/tests/scripts/runtime/features/compare_null_equals_builtin.gd
index b72e2e60..3bfca73f 100644
--- a/modules/gdscript/tests/scripts/runtime/features/compare_null_equals_builtin.gd
+++ b/modules/gdscript/tests/scripts/runtime/features/compare_null_equals_builtin.gd
@@ -61,10 +61,6 @@ func test():
 	value = Basis()
 	print(null == value)
 
-	# Transform3D
-	value = Transform3D()
-	print(null == value)
-
 	# Color
 	value = Color()
 	print(null == value)
@@ -132,7 +128,3 @@ func test():
 	# PackedColorArray
 	value = PackedColorArray()
 	print(null == value)
-
-	# PackedVector4Array
-	value = PackedVector4Array()
-	print(null == value)
diff --git a/modules/gdscript/tests/scripts/runtime/features/compare_null_not_equals_builtin.gd b/modules/gdscript/tests/scripts/runtime/features/compare_null_not_equals_builtin.gd
index 3d897360..5b7f1774 100644
--- a/modules/gdscript/tests/scripts/runtime/features/compare_null_not_equals_builtin.gd
+++ b/modules/gdscript/tests/scripts/runtime/features/compare_null_not_equals_builtin.gd
@@ -61,10 +61,6 @@ func test():
 	value = Basis()
 	print(null != value)
 
-	# Transform3D
-	value = Transform3D()
-	print(null != value)
-
 	# Color
 	value = Color()
 	print(null != value)
@@ -132,7 +128,3 @@ func test():
 	# PackedColorArray
 	value = PackedColorArray()
 	print(null != value)
-
-	# PackedVector4Array
-	value = PackedVector4Array()
-	print(null != value)
diff --git a/modules/gdscript/tests/scripts/runtime/features/stringify.gd b/modules/gdscript/tests/scripts/runtime/features/stringify.gd
index 1506e5c6..67c71291 100644
--- a/modules/gdscript/tests/scripts/runtime/features/stringify.gd
+++ b/modules/gdscript/tests/scripts/runtime/features/stringify.gd
@@ -17,7 +17,6 @@ func test():
 	print(Plane(1, 2, 3, 4))
 	print(AABB(Vector3.ZERO, Vector3.ONE))
 	print(Basis.from_euler(Vector3(0, 0, 0)))
-	print(Transform3D.IDENTITY)
 
 	print(Color(1, 2, 3, 4))
 	print(StringName("hello"))
@@ -39,4 +38,3 @@ func test():
 	print(PackedVector2Array([Vector2.ONE, Vector2.ZERO]))
 	print(PackedVector3Array([Vector3.ONE, Vector3.ZERO]))
 	print(PackedColorArray([Color.RED, Color.BLUE, Color.GREEN]))
-	print(PackedVector4Array([Vector4.ONE, Vector4.ZERO]))
diff --git a/scene/gui/line_edit.cpp b/scene/gui/line_edit.cpp
index c8f8f2df..ae212a75 100644
--- a/scene/gui/line_edit.cpp
+++ b/scene/gui/line_edit.cpp
@@ -52,6 +52,7 @@ void LineEdit::edit() {
 
 	if (!has_focus()) {
 		grab_focus();
+		return;
 	}
 
 	if (!editable || editing) {
@@ -564,6 +565,7 @@ void LineEdit::gui_input(const Ref<InputEvent> &p_event) {
 	if (editable && !editing && k->is_action_pressed("ui_text_submit", false)) {
 		edit();
 		emit_signal(SNAME("editing_toggled"), true);
+		accept_event();
 		return;
 	}
 
diff --git a/scene/gui/text_edit.cpp b/scene/gui/text_edit.cpp
index d4a5a57f..19c845e7 100644
--- a/scene/gui/text_edit.cpp
+++ b/scene/gui/text_edit.cpp
@@ -3069,8 +3069,8 @@ Control::CursorShape TextEdit::get_cursor_shape(const Point2 &p_pos) const {
 		return CURSOR_ARROW;
 	}
 
-	int xmargin_end = get_size().width - style->get_margin(SIDE_RIGHT);
-	if (draw_minimap && p_pos.x > xmargin_end - minimap_width && p_pos.x <= xmargin_end) {
+	int xmargin_end = get_size().width - style->get_margin(SIDE_RIGHT) - (v_scroll->is_visible_in_tree() ? v_scroll->get_combined_minimum_size().width : 0);
+	if (draw_minimap && p_pos.x >= xmargin_end - minimap_width && p_pos.x <= xmargin_end) {
 		return CURSOR_ARROW;
 	}
 	return get_default_cursor_shape();
@@ -4428,7 +4428,6 @@ Rect2i TextEdit::get_rect_at_line_column(int p_line, int p_column) const {
 
 int TextEdit::get_minimap_line_at_pos(const Point2i &p_pos) const {
 	float rows = p_pos.y;
-	rows -= theme_cache.style_normal->get_margin(SIDE_TOP);
 	rows /= (minimap_char_size.y + minimap_line_spacing);
 	rows += _get_v_scroll_offset();
 
@@ -8111,9 +8110,9 @@ void TextEdit::_scroll_lines_down() {
 void TextEdit::_update_minimap_hover() {
 	const Point2 mp = get_local_mouse_pos();
 	Ref<StyleBox> style = editable ? theme_cache.style_normal : theme_cache.style_readonly;
-	const int xmargin_end = get_size().width - style->get_margin(SIDE_RIGHT);
+	const int xmargin_end = get_size().width - style->get_margin(SIDE_RIGHT) - (v_scroll->is_visible_in_tree() ? v_scroll->get_combined_minimum_size().width : 0);
 
-	bool hovering_sidebar = mp.x > xmargin_end - minimap_width && mp.x < xmargin_end;
+	bool hovering_sidebar = mp.x >= xmargin_end - minimap_width && mp.x <= xmargin_end;
 	if (!hovering_sidebar) {
 		if (hovering_minimap) {
 			// Only redraw if the hovering status changed.
@@ -8139,7 +8138,7 @@ void TextEdit::_update_minimap_click() {
 	Point2 mp = get_local_mouse_pos();
 	Ref<StyleBox> style = editable ? theme_cache.style_normal : theme_cache.style_readonly;
 
-	int xmargin_end = get_size().width - style->get_margin(SIDE_RIGHT);
+	int xmargin_end = get_size().width - style->get_margin(SIDE_RIGHT) - (v_scroll->is_visible_in_tree() ? v_scroll->get_combined_minimum_size().width : 0);
 	if (!dragging_minimap && (mp.x < xmargin_end - minimap_width || mp.x > xmargin_end)) {
 		minimap_clicked = false;
 		return;
diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp
index ef0c2f19..4533edb3 100644
--- a/scene/main/viewport.cpp
+++ b/scene/main/viewport.cpp
@@ -1505,19 +1505,18 @@ void Viewport::_gui_input_event(Ref<InputEvent> p_event) {
 
 				// If the tooltip timer isn't running, start it.
 				// Otherwise, only reset the timer if the mouse has moved more than 5 pixels.
-				if (!is_tooltip_shown && over->can_process() &&
-						(gui.tooltip_timer.is_null() ||
-								Math::is_zero_approx(gui.tooltip_timer->get_time_left()) ||
-								mm->get_relative().length() > 5.0)) {
-					if (gui.tooltip_timer.is_valid()) {
-						gui.tooltip_timer->release_connections();
-						gui.tooltip_timer = Ref<SceneTreeTimer>();
+				if (!is_tooltip_shown && over->can_process()) {
+					Vector2 new_tooltip_pos = over->get_screen_transform().xform(pos);
+					if (gui.tooltip_pos.distance_squared_to(new_tooltip_pos) > 25) {
+						if (gui.tooltip_timer.is_valid()) {
+							gui.tooltip_timer->release_connections();
+						}
+						gui.tooltip_control = over;
+						gui.tooltip_pos = new_tooltip_pos;
+						gui.tooltip_timer = get_tree()->create_timer(gui.tooltip_delay);
+						gui.tooltip_timer->set_ignore_time_scale(true);
+						gui.tooltip_timer->connect("timeout", callable_mp(this, &Viewport::_gui_show_tooltip));
 					}
-					gui.tooltip_control = over;
-					gui.tooltip_pos = over->get_screen_transform().xform(pos);
-					gui.tooltip_timer = get_tree()->create_timer(gui.tooltip_delay);
-					gui.tooltip_timer->set_ignore_time_scale(true);
-					gui.tooltip_timer->connect("timeout", callable_mp(this, &Viewport::_gui_show_tooltip));
 				}
 			}
 
diff --git a/tests/core/object/test_class_db.h b/tests/core/object/test_class_db.h
index c95164f7..3a4eeabf 100644
--- a/tests/core/object/test_class_db.h
+++ b/tests/core/object/test_class_db.h
@@ -238,7 +238,6 @@ bool arg_default_value_is_assignable_to_type(const Context &p_context, const Var
 					p_arg_type.name == p_context.names_cache.node_path_type;
 		case Variant::NODE_PATH:
 			return p_arg_type.name == p_context.names_cache.node_path_type;
-		case Variant::TRANSFORM3D:
 		case Variant::TRANSFORM2D:
 		case Variant::BASIS:
 		case Variant::PLANE:
diff --git a/tests/core/object/test_object.h b/tests/core/object/test_object.h
index f1bb62cb..c6142812 100644
--- a/tests/core/object/test_object.h
+++ b/tests/core/object/test_object.h
@@ -108,9 +108,6 @@ class _MockScriptInstance : public ScriptInstance {
 	Ref<Script> get_script() const override {
 		return Ref<Script>();
 	}
-	const Variant get_rpc_config() const override {
-		return Variant();
-	}
 	ScriptLanguage *get_language() override {
 		return nullptr;
 	}
diff --git a/tests/core/templates/test_command_queue.h b/tests/core/templates/test_command_queue.h
index d2957b5c..5769786f 100644
--- a/tests/core/templates/test_command_queue.h
+++ b/tests/core/templates/test_command_queue.h
@@ -125,24 +125,6 @@ class SharedThreadState {
 
 	int func1_count = 0;
 
-	void func1(Transform3D t) {
-		func1_count++;
-	}
-	void func2(Transform3D t, float f) {
-		func1_count++;
-	}
-	void func3(Transform3D t1, Transform3D t2, Transform3D t3, Transform3D t4, Transform3D t5, Transform3D t6) {
-		func1_count++;
-	}
-	Transform3D func1r(Transform3D t) {
-		func1_count++;
-		return t;
-	}
-	Transform3D func2r(Transform3D t, float f) {
-		func1_count++;
-		return t;
-	}
-
 	void add_msg_to_write(TestMsgType type) {
 		message_types_to_write.push_back(type);
 	}
@@ -178,38 +160,8 @@ class SharedThreadState {
 		during_writing = false;
 		writer_threadwork.thread_wait_for_work();
 		while (!exit_threads) {
-			Transform3D tr;
-			Transform3D otr;
 			float f = 1;
 			during_writing = true;
-			for (int i = 0; i < message_types_to_write.size(); i++) {
-				TestMsgType msg_type = message_types_to_write[i];
-				switch (msg_type) {
-					case TEST_MSG_FUNC1_TRANSFORM:
-						command_queue.push(this, &SharedThreadState::func1, tr);
-						break;
-					case TEST_MSG_FUNC2_TRANSFORM_FLOAT:
-						command_queue.push(this, &SharedThreadState::func2, tr, f);
-						break;
-					case TEST_MSG_FUNC3_TRANSFORMx6:
-						command_queue.push(this, &SharedThreadState::func3, tr, tr, tr, tr, tr, tr);
-						break;
-					case TEST_MSGSYNC_FUNC1_TRANSFORM:
-						command_queue.push_and_sync(this, &SharedThreadState::func1, tr);
-						break;
-					case TEST_MSGSYNC_FUNC2_TRANSFORM_FLOAT:
-						command_queue.push_and_sync(this, &SharedThreadState::func2, tr, f);
-						break;
-					case TEST_MSGRET_FUNC1_TRANSFORM:
-						command_queue.push_and_ret(this, &SharedThreadState::func1r, tr, &otr);
-						break;
-					case TEST_MSGRET_FUNC2_TRANSFORM_FLOAT:
-						command_queue.push_and_ret(this, &SharedThreadState::func2r, tr, f, &otr);
-						break;
-					default:
-						break;
-				}
-			}
 			message_types_to_write.clear();
 			during_writing = false;
 
diff --git a/tests/core/variant/test_variant.h b/tests/core/variant/test_variant.h
index 89c7ef4a..0c7414e3 100644
--- a/tests/core/variant/test_variant.h
+++ b/tests/core/variant/test_variant.h
@@ -126,7 +126,7 @@ TEST_CASE("[Variant] Writer and parser Variant::FLOAT") {
 	CHECK_MESSAGE(float_parsed == 1.0e+100, "Should match the double literal.");
 }
 
-TEST_CASE("[Variant] Assignment To Bool from Int,Float,String,Vec2,Vec2i,Vec3,Vec3i,Vec4,Vec4i,Rect2,Rect2i,Trans2d,Trans3d,Color,Call,Plane,Basis,AABB,Quant,Proj,RID,and Object") {
+TEST_CASE("[Variant] Assignment To Bool from Int,Float,String,Vec2,Vec2i,Vec3,Vec3i,Vec4,Vec4i,Rect2,Rect2i,Trans2d,Color,Call,Plane,Basis,AABB,Quant,Proj,RID,and Object") {
 	Variant int_v = 0;
 	Variant bool_v = true;
 	int_v = bool_v; // int_v is now a bool
@@ -223,14 +223,6 @@ TEST_CASE("[Variant] Assignment To Bool from Int,Float,String,Vec2,Vec2i,Vec3,Ve
 	transform2d_v = bool_v;
 	CHECK(transform2d_v.get_type() == Variant::BOOL);
 
-	Variant transform3d_v = Transform3D();
-	bool_v = true;
-	transform3d_v = bool_v;
-	CHECK(transform3d_v == Variant(true));
-	bool_v = false;
-	transform3d_v = bool_v;
-	CHECK(transform3d_v.get_type() == Variant::BOOL);
-
 	Variant col_v = Color(0.5f, 0.2f, 0.75f);
 	bool_v = true;
 	col_v = bool_v;
@@ -297,7 +289,7 @@ TEST_CASE("[Variant] Assignment To Bool from Int,Float,String,Vec2,Vec2i,Vec3,Ve
 	CHECK(object_v.get_type() == Variant::BOOL);
 }
 
-TEST_CASE("[Variant] Assignment To Int from Bool,Float,String,Vec2,Vec2i,Vec3,Vec3i Vec4,Vec4i,Rect2,Rect2i,Trans2d,Trans3d,Color,Call,Plane,Basis,AABB,Quant,Proj,RID,and Object") {
+TEST_CASE("[Variant] Assignment To Int from Bool,Float,String,Vec2,Vec2i,Vec3,Vec3i Vec4,Vec4i,Rect2,Rect2i,Trans2d,Color,Call,Plane,Basis,AABB,Quant,Proj,RID,and Object") {
 	Variant bool_v = false;
 	Variant int_v = 2;
 	bool_v = int_v; // Now bool_v is int
@@ -394,14 +386,6 @@ TEST_CASE("[Variant] Assignment To Int from Bool,Float,String,Vec2,Vec2i,Vec3,Ve
 	transform2d_v = int_v;
 	CHECK(transform2d_v.get_type() == Variant::INT);
 
-	Variant transform3d_v = Transform3D();
-	int_v = 2;
-	transform3d_v = int_v;
-	CHECK(transform3d_v == Variant(2));
-	int_v = -3;
-	transform3d_v = int_v;
-	CHECK(transform3d_v.get_type() == Variant::INT);
-
 	Variant col_v = Color(0.5f, 0.2f, 0.75f);
 	int_v = 2;
 	col_v = int_v;
@@ -468,7 +452,7 @@ TEST_CASE("[Variant] Assignment To Int from Bool,Float,String,Vec2,Vec2i,Vec3,Ve
 	CHECK(object_v.get_type() == Variant::INT);
 }
 
-TEST_CASE("[Variant] Assignment To Float from Bool,Int,String,Vec2,Vec2i,Vec3,Vec3i,Vec4,Vec4i,Rect2,Rect2i,Trans2d,Trans3d,Color,Call,Plane,Basis,AABB,Quant,Proj,RID,and Object") {
+TEST_CASE("[Variant] Assignment To Float from Bool,Int,String,Vec2,Vec2i,Vec3,Vec3i,Vec4,Vec4i,Rect2,Rect2i,Trans2d,Color,Call,Plane,Basis,AABB,Quant,Proj,RID,and Object") {
 	Variant bool_v = false;
 	Variant float_v = 1.5f;
 	bool_v = float_v; // Now bool_v is float
@@ -565,14 +549,6 @@ TEST_CASE("[Variant] Assignment To Float from Bool,Int,String,Vec2,Vec2i,Vec3,Ve
 	transform2d_v = float_v;
 	CHECK(transform2d_v.get_type() == Variant::FLOAT);
 
-	Variant transform3d_v = Transform3D();
-	float_v = 1.5f;
-	transform3d_v = float_v;
-	CHECK(transform3d_v == Variant(1.5f));
-	float_v = -4.6f;
-	transform3d_v = float_v;
-	CHECK(transform2d_v.get_type() == Variant::FLOAT);
-
 	Variant col_v = Color(0.5f, 0.2f, 0.75f);
 	float_v = 1.5f;
 	col_v = float_v;
@@ -639,7 +615,7 @@ TEST_CASE("[Variant] Assignment To Float from Bool,Int,String,Vec2,Vec2i,Vec3,Ve
 	CHECK(object_v.get_type() == Variant::FLOAT);
 }
 
-TEST_CASE("[Variant] Assignment To String from Bool,Int,Float,Vec2,Vec2i,Vec3,Vec3i,Vec4,Vec4i,Rect2,Rect2i,Trans2d,Trans3d,Color,Call,Plane,Basis,AABB,Quant,Proj,RID,and Object") {
+TEST_CASE("[Variant] Assignment To String from Bool,Int,Float,Vec2,Vec2i,Vec3,Vec3i,Vec4,Vec4i,Rect2,Rect2i,Trans2d,Color,Call,Plane,Basis,AABB,Quant,Proj,RID,and Object") {
 	Variant bool_v = false;
 	Variant string_v = "Hello";
 	bool_v = string_v; // Now bool_v is string
@@ -736,14 +712,6 @@ TEST_CASE("[Variant] Assignment To String from Bool,Int,Float,Vec2,Vec2i,Vec3,Ve
 	transform2d_v = string_v;
 	CHECK(transform2d_v.get_type() == Variant::STRING);
 
-	Variant transform3d_v = Transform3D();
-	string_v = "Hello";
-	transform3d_v = string_v;
-	CHECK(transform3d_v == Variant("Hello"));
-	string_v = "Hello there";
-	transform3d_v = string_v;
-	CHECK(transform3d_v.get_type() == Variant::STRING);
-
 	Variant col_v = Color(0.5f, 0.2f, 0.75f);
 	string_v = "Hello";
 	col_v = string_v;
@@ -810,7 +778,7 @@ TEST_CASE("[Variant] Assignment To String from Bool,Int,Float,Vec2,Vec2i,Vec3,Ve
 	CHECK(object_v.get_type() == Variant::STRING);
 }
 
-TEST_CASE("[Variant] Assignment To Vec2 from Bool,Int,Float,String,Vec2i,Vec3,Vec3i,Vec4,Vec4i,Rect2,Rect2i,Trans2d,Trans3d,Color,Call,Plane,Basis,AABB,Quant,Proj,RID,and Object") {
+TEST_CASE("[Variant] Assignment To Vec2 from Bool,Int,Float,String,Vec2i,Vec3,Vec3i,Vec4,Vec4i,Rect2,Rect2i,Trans2d,Color,Call,Plane,Basis,AABB,Quant,Proj,RID,and Object") {
 	Variant bool_v = false;
 	Variant vec2_v = Vector2(2.2f, 3.5f);
 	bool_v = vec2_v; // Now bool_v is Vector2
@@ -907,14 +875,6 @@ TEST_CASE("[Variant] Assignment To Vec2 from Bool,Int,Float,String,Vec2i,Vec3,Ve
 	transform2d_v = vec2_v;
 	CHECK(transform2d_v.get_type() == Variant::VECTOR2);
 
-	Variant transform3d_v = Transform3D();
-	vec2_v = Vector2(2.2f, 3.5f);
-	transform3d_v = vec2_v;
-	CHECK(transform3d_v == Variant(Vector2(2.2f, 3.5f)));
-	vec2_v = Vector2(-5.4f, -7.9f);
-	transform3d_v = vec2_v;
-	CHECK(transform3d_v.get_type() == Variant::VECTOR2);
-
 	Variant col_v = Color(0.5f, 0.2f, 0.75f);
 	vec2_v = Vector2(2.2f, 3.5f);
 	col_v = vec2_v;
@@ -981,7 +941,7 @@ TEST_CASE("[Variant] Assignment To Vec2 from Bool,Int,Float,String,Vec2i,Vec3,Ve
 	CHECK(object_v.get_type() == Variant::VECTOR2);
 }
 
-TEST_CASE("[Variant] Assignment To Vec2i from Bool,Int,Float,String,Vec2,Vec3,Vec3i,Vec4,Vec4i,Rect2,Rect2i,Trans2d,Trans3d,Color,Call,Plane,Basis,AABB,Quant,Proj,RID,and Object") {
+TEST_CASE("[Variant] Assignment To Vec2i from Bool,Int,Float,String,Vec2,Vec3,Vec3i,Vec4,Vec4i,Rect2,Rect2i,Trans2d,Color,Call,Plane,Basis,AABB,Quant,Proj,RID,and Object") {
 	Variant bool_v = false;
 	Variant vec2i_v = Vector2i(2, 3);
 	bool_v = vec2i_v; // Now bool_v is Vector2i
@@ -1078,14 +1038,6 @@ TEST_CASE("[Variant] Assignment To Vec2i from Bool,Int,Float,String,Vec2,Vec3,Ve
 	transform2d_v = vec2i_v;
 	CHECK(transform2d_v.get_type() == Variant::VECTOR2I);
 
-	Variant transform3d_v = Transform3D();
-	vec2i_v = Vector2i(2, 3);
-	transform3d_v = vec2i_v;
-	CHECK(transform3d_v == Variant(Vector2i(2, 3)));
-	vec2i_v = Vector2i(-5, -7);
-	transform3d_v = vec2i_v;
-	CHECK(transform3d_v.get_type() == Variant::VECTOR2I);
-
 	Variant col_v = Color(0.5f, 0.2f, 0.75f);
 	vec2i_v = Vector2i(2, 3);
 	col_v = vec2i_v;
@@ -1152,7 +1104,7 @@ TEST_CASE("[Variant] Assignment To Vec2i from Bool,Int,Float,String,Vec2,Vec3,Ve
 	CHECK(object_v.get_type() == Variant::VECTOR2I);
 }
 
-TEST_CASE("[Variant] Assignment To Vec3 from Bool,Int,Float,String,Vec2,Vec2i,Vec3i,Vec4,Vec4i,Rect2,Rect2i,Trans2d,Trans3d,Color,Call,Plane,Basis,AABB,Quant,Proj,RID,and Object") {
+TEST_CASE("[Variant] Assignment To Vec3 from Bool,Int,Float,String,Vec2,Vec2i,Vec3i,Vec4,Vec4i,Rect2,Rect2i,Trans2d,Color,Call,Plane,Basis,AABB,Quant,Proj,RID,and Object") {
 	Variant bool_v = false;
 	Variant vec3_v = Vector3(2.2f, 3.5f, 5.3f);
 	bool_v = vec3_v; // Now bool_v is Vector3
@@ -1249,14 +1201,6 @@ TEST_CASE("[Variant] Assignment To Vec3 from Bool,Int,Float,String,Vec2,Vec2i,Ve
 	transform2d_v = vec3_v;
 	CHECK(transform2d_v.get_type() == Variant::VECTOR3);
 
-	Variant transform3d_v = Transform3D();
-	vec3_v = Vector3(2.2f, 3.5f, 5.3f);
-	transform3d_v = vec3_v;
-	CHECK(transform3d_v == Variant(Vector3(2.2f, 3.5f, 5.3f)));
-	vec3_v = Vector3(-5.4f, -7.9f, -2.1f);
-	transform3d_v = vec3_v;
-	CHECK(transform3d_v.get_type() == Variant::VECTOR3);
-
 	Variant col_v = Color(0.5f, 0.2f, 0.75f);
 	vec3_v = Vector3(2.2f, 3.5f, 5.3f);
 	col_v = vec3_v;
@@ -1412,14 +1356,6 @@ TEST_CASE("[Variant] Assignment To Vec3i from Bool,Int,Float,String,Vec2,Vec2i,V
 	transform2d_v = vec3i_v;
 	CHECK(transform2d_v.get_type() == Variant::VECTOR3I);
 
-	Variant transform3d_v = Transform3D();
-	vec3i_v = Vector3i(2, 3, 5);
-	transform3d_v = vec3i_v;
-	CHECK(transform3d_v == Variant(Vector3i(2, 3, 5)));
-	vec3i_v = Vector3i(-5, -7, -2);
-	transform3d_v = vec3i_v;
-	CHECK(transform3d_v.get_type() == Variant::VECTOR3I);
-
 	Variant col_v = Color(0.5f, 0.2f, 0.75f);
 	vec3i_v = Vector3i(2, 3, 5);
 	col_v = vec3i_v;
@@ -1486,7 +1422,7 @@ TEST_CASE("[Variant] Assignment To Vec3i from Bool,Int,Float,String,Vec2,Vec2i,V
 	CHECK(object_v.get_type() == Variant::VECTOR3I);
 }
 
-TEST_CASE("[Variant] Assignment To Color from Bool,Int,Float,String,Vec2,Vec2i,Vec3,Vec3i,Vec4,Vec4i,Rect2,Rect2i,Trans2d,Trans3d,Color,Call,Plane,Basis,AABB,Quant,Proj,RID,and Object") {
+TEST_CASE("[Variant] Assignment To Color from Bool,Int,Float,String,Vec2,Vec2i,Vec3,Vec3i,Vec4,Vec4i,Rect2,Rect2i,Trans2d,Color,Call,Plane,Basis,AABB,Quant,Proj,RID,and Object") {
 	Variant bool_v = false;
 	Variant col_v = Color(0.25f, 0.4f, 0.78f);
 	bool_v = col_v; // Now bool_v is Color
@@ -1591,14 +1527,6 @@ TEST_CASE("[Variant] Assignment To Color from Bool,Int,Float,String,Vec2,Vec2i,V
 	transform2d_v = col_v;
 	CHECK(transform2d_v.get_type() == Variant::COLOR);
 
-	Variant transform3d_v = Transform3D();
-	col_v = Color(0.25f, 0.4f, 0.78f);
-	transform3d_v = col_v;
-	CHECK(transform3d_v == Variant(Color(0.25f, 0.4f, 0.78f)));
-	col_v = Color(0.33f, 0.75f, 0.21f);
-	transform3d_v = col_v;
-	CHECK(transform3d_v.get_type() == Variant::COLOR);
-
 	Variant call_v = Callable();
 	col_v = Color(0.25f, 0.4f, 0.78f);
 	call_v = col_v;
@@ -1857,11 +1785,6 @@ TEST_CASE("[Variant] Identity comparison") {
 	CHECK(plane.identity_compare(Plane()));
 	CHECK_FALSE(plane.identity_compare(Plane(Vector3(1, 2, 3), 42)));
 
-	Variant projection = Projection();
-	CHECK(projection.identity_compare(projection));
-	CHECK(projection.identity_compare(Projection()));
-	CHECK_FALSE(projection.identity_compare(Projection(Transform3D(Basis(Vector3(1, 2, 3).normalized(), 45), Vector3(1, 2, 3)))));
-
 	Variant rect2 = Rect2();
 	CHECK(rect2.identity_compare(rect2));
 	CHECK(rect2.identity_compare(Rect2()));
@@ -1897,11 +1820,6 @@ TEST_CASE("[Variant] Identity comparison") {
 	CHECK(transform2d.identity_compare(Transform2D()));
 	CHECK_FALSE(transform2d.identity_compare(Transform2D(45, Vector2(1, 2))));
 
-	Variant transform3d = Transform3D();
-	CHECK(transform3d.identity_compare(transform3d));
-	CHECK(transform3d.identity_compare(Transform3D()));
-	// CHECK_FALSE(transform3d.identity_compare(Transform3D(Basis(Quaternion(Vector3(1, 2, 3).normalized(), 45)), Vector3(1, 2, 3))));
-
 	Variant vect2 = Vector2();
 	CHECK(vect2.identity_compare(vect2));
 	CHECK(vect2.identity_compare(Vector2()));
diff --git a/tests/core/variant/test_variant_utility.h b/tests/core/variant/test_variant_utility.h
index 93458b63..5f14be56 100644
--- a/tests/core/variant/test_variant_utility.h
+++ b/tests/core/variant/test_variant_utility.h
@@ -75,23 +75,6 @@ TEST_CASE("[VariantUtility] Type conversion") {
 	CHECK(converted.get_type() == Variant::Type::VECTOR3I);
 	CHECK(converted == Variant(Vector3i(1, 3, 5)));
 
-	{
-		Basis basis = Basis::from_scale(Vector3(1.2, 3.4, 5.6));
-		Transform3D transform = Transform3D(basis, Vector3());
-
-		converted = VariantUtilityFunctions::type_convert(transform, Variant::Type::BASIS);
-		CHECK(converted.get_type() == Variant::Type::BASIS);
-		CHECK(converted == basis);
-
-		converted = VariantUtilityFunctions::type_convert(basis, Variant::Type::TRANSFORM3D);
-		CHECK(converted.get_type() == Variant::Type::TRANSFORM3D);
-		CHECK(converted == transform);
-
-		converted = VariantUtilityFunctions::type_convert(basis, Variant::Type::STRING);
-		CHECK(converted.get_type() == Variant::Type::STRING);
-		CHECK(converted == Variant("[X: (1.2, 0, 0), Y: (0, 3.4, 0), Z: (0, 0, 5.6)]"));
-	}
-
 	{
 		Array arr;
 		arr.push_back(1.2);
diff --git a/tests/scene/test_animation.h b/tests/scene/test_animation.h
index b4839e03..7e65aff3 100644
--- a/tests/scene/test_animation.h
+++ b/tests/scene/test_animation.h
@@ -55,7 +55,6 @@ TEST_CASE("[Animation] Create value track") {
 	animation->track_insert_key(track_index, 0.5, 100);
 
 	CHECK(animation->get_track_count() == 1);
-	CHECK(!animation->track_is_compressed(0));
 	CHECK(int(animation->track_get_key_value(0, 0)) == 0);
 	CHECK(int(animation->track_get_key_value(0, 1)) == 100);
 
@@ -82,11 +81,6 @@ TEST_CASE("[Animation] Create value track") {
 	CHECK(animation->track_get_key_transition(1, 0) == doctest::Approx(real_t(-1.0)));
 
 	// This is a value track, so the methods below should return errors.
-	CHECK(animation->try_position_track_interpolate(0, 0.0, nullptr) == ERR_INVALID_PARAMETER);
-	CHECK(animation->try_rotation_track_interpolate(0, 0.0, nullptr) == ERR_INVALID_PARAMETER);
-	CHECK(animation->try_scale_track_interpolate(0, 0.0, nullptr) == ERR_INVALID_PARAMETER);
-	CHECK(animation->bezier_track_interpolate(0, 0.0) == doctest::Approx(0.0));
-	CHECK(animation->try_blend_shape_track_interpolate(0, 0.0, nullptr) == ERR_INVALID_PARAMETER);
 	ERR_PRINT_ON;
 }
 
@@ -98,7 +92,6 @@ TEST_CASE("[Animation] Create Bezier track") {
 	animation->bezier_track_insert_key(track_index, 0.5, 1.0, Vector2(0, 1), Vector2(1, 0.5));
 
 	CHECK(animation->get_track_count() == 1);
-	CHECK(!animation->track_is_compressed(0));
 
 	CHECK(animation->bezier_track_get_key_value(0, 0) == doctest::Approx(real_t(-1.0)));
 	CHECK(animation->bezier_track_get_key_value(0, 1) == doctest::Approx(real_t(1.0)));
@@ -113,10 +106,6 @@ TEST_CASE("[Animation] Create Bezier track") {
 	// This is a bezier track, so the methods below should return errors.
 	ERR_PRINT_OFF;
 	CHECK(animation->value_track_interpolate(0, 0.0).is_null());
-	CHECK(animation->try_position_track_interpolate(0, 0.0, nullptr) == ERR_INVALID_PARAMETER);
-	CHECK(animation->try_rotation_track_interpolate(0, 0.0, nullptr) == ERR_INVALID_PARAMETER);
-	CHECK(animation->try_scale_track_interpolate(0, 0.0, nullptr) == ERR_INVALID_PARAMETER);
-	CHECK(animation->try_blend_shape_track_interpolate(0, 0.0, nullptr) == ERR_INVALID_PARAMETER);
 	ERR_PRINT_ON;
 }
 
diff --git a/tests/scene/test_camera_2d.h b/tests/scene/test_camera_2d.h
new file mode 100644
index 00000000..f03a4aed
--- /dev/null
+++ b/tests/scene/test_camera_2d.h
@@ -0,0 +1,318 @@
+/**************************************************************************/
+/*  test_camera_2d.h                                                      */
+/**************************************************************************/
+/*                         This file is part of:                          */
+/*                             GODOT ENGINE                               */
+/*                        https://godotengine.org                         */
+/**************************************************************************/
+/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
+/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
+/*                                                                        */
+/* Permission is hereby granted, free of charge, to any person obtaining  */
+/* a copy of this software and associated documentation files (the        */
+/* "Software"), to deal in the Software without restriction, including    */
+/* without limitation the rights to use, copy, modify, merge, publish,    */
+/* distribute, sublicense, and/or sell copies of the Software, and to     */
+/* permit persons to whom the Software is furnished to do so, subject to  */
+/* the following conditions:                                              */
+/*                                                                        */
+/* The above copyright notice and this permission notice shall be         */
+/* included in all copies or substantial portions of the Software.        */
+/*                                                                        */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
+/**************************************************************************/
+
+#ifndef TEST_CAMERA_2D_H
+#define TEST_CAMERA_2D_H
+
+#include "scene/2d/camera_2d.h"
+#include "scene/main/viewport.h"
+#include "scene/main/window.h"
+#include "tests/test_macros.h"
+
+namespace TestCamera2D {
+
+TEST_CASE("[SceneTree][Camera2D] Getters and setters") {
+	Camera2D *test_camera = memnew(Camera2D);
+
+	SUBCASE("AnchorMode") {
+		test_camera->set_anchor_mode(Camera2D::AnchorMode::ANCHOR_MODE_FIXED_TOP_LEFT);
+		CHECK(test_camera->get_anchor_mode() == Camera2D::AnchorMode::ANCHOR_MODE_FIXED_TOP_LEFT);
+		test_camera->set_anchor_mode(Camera2D::AnchorMode::ANCHOR_MODE_DRAG_CENTER);
+		CHECK(test_camera->get_anchor_mode() == Camera2D::AnchorMode::ANCHOR_MODE_DRAG_CENTER);
+	}
+
+	SUBCASE("ProcessCallback") {
+		test_camera->set_process_callback(Camera2D::Camera2DProcessCallback::CAMERA2D_PROCESS_PHYSICS);
+		CHECK(test_camera->get_process_callback() == Camera2D::Camera2DProcessCallback::CAMERA2D_PROCESS_PHYSICS);
+		test_camera->set_process_callback(Camera2D::Camera2DProcessCallback::CAMERA2D_PROCESS_IDLE);
+		CHECK(test_camera->get_process_callback() == Camera2D::Camera2DProcessCallback::CAMERA2D_PROCESS_IDLE);
+	}
+
+	SUBCASE("Drag") {
+		constexpr float drag_left_margin = 0.8f;
+		constexpr float drag_top_margin = 0.8f;
+		constexpr float drag_right_margin = 0.8f;
+		constexpr float drag_bottom_margin = 0.8f;
+		constexpr float drag_horizontal_offset1 = 0.5f;
+		constexpr float drag_horizontal_offset2 = -0.5f;
+		constexpr float drag_vertical_offset1 = 0.5f;
+		constexpr float drag_vertical_offset2 = -0.5f;
+		test_camera->set_drag_margin(SIDE_LEFT, drag_left_margin);
+		CHECK(test_camera->get_drag_margin(SIDE_LEFT) == drag_left_margin);
+		test_camera->set_drag_margin(SIDE_TOP, drag_top_margin);
+		CHECK(test_camera->get_drag_margin(SIDE_TOP) == drag_top_margin);
+		test_camera->set_drag_margin(SIDE_RIGHT, drag_right_margin);
+		CHECK(test_camera->get_drag_margin(SIDE_RIGHT) == drag_right_margin);
+		test_camera->set_drag_margin(SIDE_BOTTOM, drag_bottom_margin);
+		CHECK(test_camera->get_drag_margin(SIDE_BOTTOM) == drag_bottom_margin);
+		test_camera->set_drag_horizontal_enabled(true);
+		CHECK(test_camera->is_drag_horizontal_enabled());
+		test_camera->set_drag_horizontal_enabled(false);
+		CHECK_FALSE(test_camera->is_drag_horizontal_enabled());
+		test_camera->set_drag_horizontal_offset(drag_horizontal_offset1);
+		CHECK(test_camera->get_drag_horizontal_offset() == drag_horizontal_offset1);
+		test_camera->set_drag_horizontal_offset(drag_horizontal_offset2);
+		CHECK(test_camera->get_drag_horizontal_offset() == drag_horizontal_offset2);
+		test_camera->set_drag_vertical_enabled(true);
+		CHECK(test_camera->is_drag_vertical_enabled());
+		test_camera->set_drag_vertical_enabled(false);
+		CHECK_FALSE(test_camera->is_drag_vertical_enabled());
+		test_camera->set_drag_vertical_offset(drag_vertical_offset1);
+		CHECK(test_camera->get_drag_vertical_offset() == drag_vertical_offset1);
+		test_camera->set_drag_vertical_offset(drag_vertical_offset2);
+		CHECK(test_camera->get_drag_vertical_offset() == drag_vertical_offset2);
+	}
+
+	SUBCASE("Drawing") {
+		test_camera->set_margin_drawing_enabled(true);
+		CHECK(test_camera->is_margin_drawing_enabled());
+		test_camera->set_margin_drawing_enabled(false);
+		CHECK_FALSE(test_camera->is_margin_drawing_enabled());
+		test_camera->set_limit_drawing_enabled(true);
+		CHECK(test_camera->is_limit_drawing_enabled());
+		test_camera->set_limit_drawing_enabled(false);
+		CHECK_FALSE(test_camera->is_limit_drawing_enabled());
+		test_camera->set_screen_drawing_enabled(true);
+		CHECK(test_camera->is_screen_drawing_enabled());
+		test_camera->set_screen_drawing_enabled(false);
+		CHECK_FALSE(test_camera->is_screen_drawing_enabled());
+	}
+
+	SUBCASE("Enabled") {
+		test_camera->set_enabled(true);
+		CHECK(test_camera->is_enabled());
+		test_camera->set_enabled(false);
+		CHECK_FALSE(test_camera->is_enabled());
+	}
+
+	SUBCASE("Rotation") {
+		constexpr float rotation_smoothing_speed = 20.0f;
+		test_camera->set_ignore_rotation(true);
+		CHECK(test_camera->is_ignoring_rotation());
+		test_camera->set_ignore_rotation(false);
+		CHECK_FALSE(test_camera->is_ignoring_rotation());
+		test_camera->set_rotation_smoothing_enabled(true);
+		CHECK(test_camera->is_rotation_smoothing_enabled());
+		test_camera->set_rotation_smoothing_speed(rotation_smoothing_speed);
+		CHECK(test_camera->get_rotation_smoothing_speed() == rotation_smoothing_speed);
+	}
+
+	SUBCASE("Zoom") {
+		const Vector2 zoom = Vector2(4, 4);
+		test_camera->set_zoom(zoom);
+		CHECK(test_camera->get_zoom() == zoom);
+	}
+
+	SUBCASE("Offset") {
+		const Vector2 offset = Vector2(100, 100);
+		test_camera->set_offset(offset);
+		CHECK(test_camera->get_offset() == offset);
+	}
+
+	SUBCASE("Limit") {
+		constexpr int limit_left = 100;
+		constexpr int limit_top = 100;
+		constexpr int limit_right = 100;
+		constexpr int limit_bottom = 100;
+		test_camera->set_limit_smoothing_enabled(true);
+		CHECK(test_camera->is_limit_smoothing_enabled());
+		test_camera->set_limit_smoothing_enabled(false);
+		CHECK_FALSE(test_camera->is_limit_smoothing_enabled());
+		test_camera->set_limit(SIDE_LEFT, limit_left);
+		CHECK(test_camera->get_limit(SIDE_LEFT) == limit_left);
+		test_camera->set_limit(SIDE_TOP, limit_top);
+		CHECK(test_camera->get_limit(SIDE_TOP) == limit_top);
+		test_camera->set_limit(SIDE_RIGHT, limit_right);
+		CHECK(test_camera->get_limit(SIDE_RIGHT) == limit_right);
+		test_camera->set_limit(SIDE_BOTTOM, limit_bottom);
+		CHECK(test_camera->get_limit(SIDE_BOTTOM) == limit_bottom);
+	}
+
+	SUBCASE("Position") {
+		constexpr float smoothing_speed = 20.0f;
+		test_camera->set_position_smoothing_enabled(true);
+		CHECK(test_camera->is_position_smoothing_enabled());
+		test_camera->set_position_smoothing_speed(smoothing_speed);
+		CHECK(test_camera->get_position_smoothing_speed() == smoothing_speed);
+	}
+
+	memdelete(test_camera);
+}
+
+TEST_CASE("[SceneTree][Camera2D] Camera positioning") {
+	SubViewport *mock_viewport = memnew(SubViewport);
+	Camera2D *test_camera = memnew(Camera2D);
+
+	mock_viewport->set_size(Vector2(400, 200));
+	SceneTree::get_singleton()->get_root()->add_child(mock_viewport);
+	mock_viewport->add_child(test_camera);
+
+	SUBCASE("Anchor mode") {
+		test_camera->set_anchor_mode(Camera2D::ANCHOR_MODE_DRAG_CENTER);
+		CHECK(test_camera->get_camera_screen_center().is_equal_approx(Vector2(0, 0)));
+		CHECK(test_camera->get_camera_position().is_equal_approx(Vector2(0, 0)));
+
+		test_camera->set_anchor_mode(Camera2D::ANCHOR_MODE_FIXED_TOP_LEFT);
+		CHECK(test_camera->get_camera_screen_center().is_equal_approx(Vector2(200, 100)));
+		CHECK(test_camera->get_camera_position().is_equal_approx(Vector2(0, 0)));
+	}
+
+	SUBCASE("Offset") {
+		test_camera->set_offset(Vector2(100, 100));
+		CHECK(test_camera->get_camera_screen_center().is_equal_approx(Vector2(100, 100)));
+		CHECK(test_camera->get_camera_position().is_equal_approx(Vector2(0, 0)));
+
+		test_camera->set_offset(Vector2(-100, 300));
+		CHECK(test_camera->get_camera_screen_center().is_equal_approx(Vector2(-100, 300)));
+		CHECK(test_camera->get_camera_position().is_equal_approx(Vector2(0, 0)));
+
+		test_camera->set_offset(Vector2(0, 0));
+		CHECK(test_camera->get_camera_screen_center().is_equal_approx(Vector2(0, 0)));
+		CHECK(test_camera->get_camera_position().is_equal_approx(Vector2(0, 0)));
+	}
+
+	SUBCASE("Limits") {
+		test_camera->set_limit(SIDE_LEFT, 100);
+		test_camera->set_limit(SIDE_TOP, 50);
+
+		CHECK(test_camera->get_camera_screen_center().is_equal_approx(Vector2(300, 150)));
+		CHECK(test_camera->get_camera_position().is_equal_approx(Vector2(0, 0)));
+
+		test_camera->set_limit(SIDE_LEFT, 0);
+		test_camera->set_limit(SIDE_TOP, 0);
+
+		CHECK(test_camera->get_camera_screen_center().is_equal_approx(Vector2(200, 100)));
+		CHECK(test_camera->get_camera_position().is_equal_approx(Vector2(0, 0)));
+	}
+
+	SUBCASE("Drag") {
+		CHECK(test_camera->get_camera_screen_center().is_equal_approx(Vector2(0, 0)));
+
+		// horizontal
+		test_camera->set_drag_horizontal_enabled(true);
+		test_camera->set_drag_margin(SIDE_RIGHT, 0.5);
+
+		test_camera->set_position(Vector2(100, 100));
+		test_camera->force_update_scroll();
+		CHECK(test_camera->get_camera_position().is_equal_approx(Vector2(0, 100)));
+		CHECK(test_camera->get_camera_screen_center().is_equal_approx(Vector2(0, 100)));
+		test_camera->set_position(Vector2(101, 101));
+		test_camera->force_update_scroll();
+		CHECK(test_camera->get_camera_position().is_equal_approx(Vector2(1, 101)));
+		CHECK(test_camera->get_camera_screen_center().is_equal_approx(Vector2(1, 101)));
+
+		// test align
+		test_camera->set_position(Vector2(0, 0));
+		test_camera->align();
+		CHECK(test_camera->get_camera_position().is_equal_approx(Vector2(0, 0)));
+		CHECK(test_camera->get_camera_screen_center().is_equal_approx(Vector2(0, 0)));
+
+		// vertical
+		test_camera->set_drag_vertical_enabled(true);
+		test_camera->set_drag_horizontal_enabled(false);
+		test_camera->set_drag_margin(SIDE_TOP, 0.3);
+
+		test_camera->set_position(Vector2(200, -20));
+		test_camera->force_update_scroll();
+		CHECK(test_camera->get_camera_position().is_equal_approx(Vector2(200, 0)));
+		CHECK(test_camera->get_camera_screen_center().is_equal_approx(Vector2(200, 0)));
+		test_camera->set_position(Vector2(250, -55));
+		test_camera->force_update_scroll();
+		CHECK(test_camera->get_camera_position().is_equal_approx(Vector2(250, -25)));
+		CHECK(test_camera->get_camera_screen_center().is_equal_approx(Vector2(250, -25)));
+	}
+
+	memdelete(test_camera);
+	memdelete(mock_viewport);
+}
+
+TEST_CASE("[SceneTree][Camera2D] Transforms") {
+	SubViewport *mock_viewport = memnew(SubViewport);
+	Camera2D *test_camera = memnew(Camera2D);
+
+	mock_viewport->set_size(Vector2(400, 200));
+	SceneTree::get_singleton()->get_root()->add_child(mock_viewport);
+	mock_viewport->add_child(test_camera);
+
+	SUBCASE("Default camera") {
+		Transform2D xform = mock_viewport->get_canvas_transform();
+		// x,y are basis vectors, origin = screen center
+		Transform2D test_xform = Transform2D(Vector2(1, 0), Vector2(0, 1), Vector2(200, 100));
+		CHECK(xform.is_equal_approx(test_xform));
+	}
+
+	SUBCASE("Zoom") {
+		test_camera->set_zoom(Vector2(0.5, 2));
+		Transform2D xform = mock_viewport->get_canvas_transform();
+		Transform2D test_xform = Transform2D(Vector2(0.5, 0), Vector2(0, 2), Vector2(200, 100));
+		CHECK(xform.is_equal_approx(test_xform));
+
+		test_camera->set_zoom(Vector2(10, 10));
+		xform = mock_viewport->get_canvas_transform();
+		test_xform = Transform2D(Vector2(10, 0), Vector2(0, 10), Vector2(200, 100));
+		CHECK(xform.is_equal_approx(test_xform));
+
+		test_camera->set_zoom(Vector2(1, 1));
+		xform = mock_viewport->get_canvas_transform();
+		test_xform = Transform2D(Vector2(1, 0), Vector2(0, 1), Vector2(200, 100));
+		CHECK(xform.is_equal_approx(test_xform));
+	}
+
+	SUBCASE("Rotation") {
+		test_camera->set_rotation(Math_PI / 2);
+		Transform2D xform = mock_viewport->get_canvas_transform();
+		Transform2D test_xform = Transform2D(Vector2(1, 0), Vector2(0, 1), Vector2(200, 100));
+		CHECK(xform.is_equal_approx(test_xform));
+
+		test_camera->set_ignore_rotation(false);
+		xform = mock_viewport->get_canvas_transform();
+		test_xform = Transform2D(Vector2(0, -1), Vector2(1, 0), Vector2(200, 100));
+		CHECK(xform.is_equal_approx(test_xform));
+
+		test_camera->set_rotation(-1 * Math_PI);
+		test_camera->force_update_scroll();
+		xform = mock_viewport->get_canvas_transform();
+		test_xform = Transform2D(Vector2(-1, 0), Vector2(0, -1), Vector2(200, 100));
+		CHECK(xform.is_equal_approx(test_xform));
+
+		test_camera->set_rotation(0);
+		test_camera->force_update_scroll();
+		xform = mock_viewport->get_canvas_transform();
+		test_xform = Transform2D(Vector2(1, 0), Vector2(0, 1), Vector2(200, 100));
+		CHECK(xform.is_equal_approx(test_xform));
+	}
+
+	memdelete(test_camera);
+	memdelete(mock_viewport);
+}
+
+} // namespace TestCamera2D
+
+#endif // TEST_CAMERA_2D_H
diff --git a/tests/scene/test_curve.h b/tests/scene/test_curve.h
index 579b4d24..d3011c22 100644
--- a/tests/scene/test_curve.h
+++ b/tests/scene/test_curve.h
@@ -245,23 +245,6 @@ TEST_CASE("[Curve2D] Linear sampling should return exact value") {
 	}
 }
 
-TEST_CASE("Curve3D Linear sampling should return exact value") {
-	Ref<Curve3D> curve = memnew(Curve3D);
-	real_t len = 2048.0;
-
-	curve->add_point(Vector3(0, 0, 0));
-	curve->add_point(Vector3(len, 0, 0));
-	ERR_PRINT_OFF
-	real_t baked_length = curve->get_baked_length();
-	ERR_PRINT_ON
-	CHECK(len == baked_length);
-
-	for (int i = 0; i < len; i++) {
-		Vector3 pos = curve->sample_baked(i);
-		CHECK_MESSAGE(Math::is_equal_approx(pos.x, i), "sample_baked should return exact value");
-	}
-}
-
 } // namespace TestCurve
 
 #endif // TEST_CURVE_H
diff --git a/tests/scene/test_gradient_texture.h b/tests/scene/test_gradient_texture.h
index 16a92fbe..3f116df3 100644
--- a/tests/scene/test_gradient_texture.h
+++ b/tests/scene/test_gradient_texture.h
@@ -48,9 +48,6 @@ TEST_CASE("[SceneTree][GradientTexture1D] Create GradientTexture1D") {
 
 	gradient_texture->set_width(83);
 	CHECK(gradient_texture->get_width() == 83);
-
-	gradient_texture->set_use_hdr(true);
-	CHECK(gradient_texture->is_using_hdr());
 }
 
 TEST_CASE("[SceneTree][GradientTexture2D] Create GradientTexture2D") {
@@ -66,9 +63,6 @@ TEST_CASE("[SceneTree][GradientTexture2D] Create GradientTexture2D") {
 	gradient_texture->set_height(81);
 	CHECK(gradient_texture->get_height() == 81);
 
-	gradient_texture->set_use_hdr(true);
-	CHECK(gradient_texture->is_using_hdr());
-
 	gradient_texture->set_fill(GradientTexture2D::Fill::FILL_SQUARE);
 	CHECK(gradient_texture->get_fill() == GradientTexture2D::Fill::FILL_SQUARE);
 
diff --git a/tests/scene/test_text_edit.h b/tests/scene/test_text_edit.h
index 46a5046b..b7dcd7d7 100644
--- a/tests/scene/test_text_edit.h
+++ b/tests/scene/test_text_edit.h
@@ -55,7 +55,6 @@ static inline Array reverse_nested(Array array) {
 }
 
 TEST_CASE("[SceneTree][TextEdit] text entry") {
-	SceneTree::get_singleton()->get_root()->set_physics_object_picking(false);
 	TextEdit *text_edit = memnew(TextEdit);
 	SceneTree::get_singleton()->get_root()->add_child(text_edit);
 	text_edit->grab_focus();
@@ -7445,7 +7444,8 @@ TEST_CASE("[SceneTree][TextEdit] viewport") {
 	text_edit->set_line_as_last_visible(visible_lines * 2);
 	MessageQueue::get_singleton()->flush();
 	CHECK(text_edit->get_first_visible_line() == visible_lines);
-	CHECK(text_edit->get_v_scroll() == visible_lines);
+	double v_offset = text_edit->get_v_scroll_bar()->get_max() - floor(text_edit->get_v_scroll_bar()->get_max());
+	CHECK(text_edit->get_v_scroll() == v_offset + visible_lines);
 	CHECK(text_edit->get_last_full_visible_line() == (visible_lines * 2) - 1);
 	CHECK(text_edit->get_last_full_visible_line_wrap_index() == 0);
 
@@ -7466,7 +7466,7 @@ TEST_CASE("[SceneTree][TextEdit] viewport") {
 	text_edit->set_line_as_last_visible(visible_lines + 5, 1);
 	MessageQueue::get_singleton()->flush();
 	CHECK(text_edit->get_first_visible_line() == 16);
-	CHECK(text_edit->get_v_scroll() == 32.0);
+	CHECK(text_edit->get_v_scroll() == v_offset + 32);
 	CHECK(text_edit->get_last_full_visible_line() == visible_lines + 5);
 	CHECK(text_edit->get_last_full_visible_line_wrap_index() == 0);
 
@@ -7550,7 +7550,7 @@ TEST_CASE("[SceneTree][TextEdit] viewport") {
 	MessageQueue::get_singleton()->flush();
 	CHECK(text_edit->is_caret_visible());
 	CHECK(text_edit->get_first_visible_line() == 5);
-	CHECK(text_edit->get_v_scroll() == 5);
+	CHECK(text_edit->get_v_scroll() == v_offset + 5);
 	CHECK(text_edit->get_last_full_visible_line() == (visible_lines - 1) + 5);
 	CHECK(text_edit->get_last_full_visible_line_wrap_index() == 0);
 
@@ -7606,7 +7606,7 @@ TEST_CASE("[SceneTree][TextEdit] viewport") {
 	MessageQueue::get_singleton()->flush();
 
 	CHECK(text_edit->get_first_visible_line() == (visible_lines / 2) + 6);
-	CHECK(text_edit->get_v_scroll() == (visible_lines + (visible_lines / 2)) + 1);
+	CHECK(text_edit->get_v_scroll() == (text_edit->get_v_scroll_bar()->get_max() - floor(text_edit->get_v_scroll_bar()->get_max())) + (visible_lines + (visible_lines / 2)) + 1);
 	CHECK(text_edit->get_last_full_visible_line() == (visible_lines) + 5);
 	CHECK(text_edit->get_last_full_visible_line_wrap_index() == 0);
 	CHECK(text_edit->get_caret_wrap_index() == 1);
@@ -7717,7 +7717,7 @@ TEST_CASE("[SceneTree][TextEdit] viewport") {
 	CHECK(text_edit->get_h_scroll() == 0);
 
 	text_edit->set_h_scroll(10000000);
-	CHECK(text_edit->get_h_scroll() == 306);
+	CHECK(text_edit->get_h_scroll() == text_edit->get_h_scroll_bar()->get_max() - text_edit->get_h_scroll_bar()->get_page());
 	CHECK(text_edit->get_h_scroll_bar()->get_combined_minimum_size().x == 8);
 
 	text_edit->set_h_scroll(-100);
@@ -7754,7 +7754,7 @@ TEST_CASE("[SceneTree][TextEdit] viewport") {
 	CHECK(text_edit->get_viewport()->is_input_handled());
 	CHECK(text_edit->get_caret_line() == 21);
 	CHECK(text_edit->get_first_visible_line() == 0);
-	CHECK(text_edit->get_v_scroll() == 0);
+	CHECK(text_edit->get_v_scroll() == v_offset);
 	CHECK(text_edit->get_last_full_visible_line() == visible_lines - 1);
 	CHECK(text_edit->get_last_full_visible_line_wrap_index() == 0);
 	CHECK(text_edit->get_caret_wrap_index() == 0);
@@ -7763,7 +7763,7 @@ TEST_CASE("[SceneTree][TextEdit] viewport") {
 	CHECK(text_edit->get_viewport()->is_input_handled());
 	CHECK(text_edit->get_caret_line() == 41);
 	CHECK(text_edit->get_first_visible_line() == 20);
-	CHECK(text_edit->get_v_scroll() == 20);
+	CHECK(text_edit->get_v_scroll() == v_offset + 20);
 	CHECK(text_edit->get_last_full_visible_line() == (visible_lines - 1) * 2);
 	CHECK(text_edit->get_last_full_visible_line_wrap_index() == 0);
 	CHECK(text_edit->get_caret_wrap_index() == 0);
@@ -7772,7 +7772,7 @@ TEST_CASE("[SceneTree][TextEdit] viewport") {
 	CHECK(text_edit->get_viewport()->is_input_handled());
 	CHECK(text_edit->get_caret_line() == 21);
 	CHECK(text_edit->get_first_visible_line() == 20);
-	CHECK(text_edit->get_v_scroll() == 20);
+	CHECK(text_edit->get_v_scroll() == v_offset + 20);
 	CHECK(text_edit->get_last_full_visible_line() == (visible_lines - 1) * 2);
 	CHECK(text_edit->get_last_full_visible_line_wrap_index() == 0);
 	CHECK(text_edit->get_caret_wrap_index() == 0);
@@ -7813,7 +7813,7 @@ TEST_CASE("[SceneTree][TextEdit] viewport") {
 	CHECK(text_edit->get_viewport()->is_input_handled());
 	CHECK(text_edit->get_caret_line() == 22);
 	CHECK(text_edit->get_first_visible_line() == 1);
-	CHECK(text_edit->get_v_scroll() == 1);
+	CHECK(text_edit->get_v_scroll() == v_offset + 1);
 	CHECK(text_edit->get_last_full_visible_line() == visible_lines);
 	CHECK(text_edit->get_last_full_visible_line_wrap_index() == 0);
 	CHECK(text_edit->get_caret_wrap_index() == 0);
@@ -7822,7 +7822,7 @@ TEST_CASE("[SceneTree][TextEdit] viewport") {
 	CHECK(text_edit->get_viewport()->is_input_handled());
 	CHECK(text_edit->get_caret_line() == 42);
 	CHECK(text_edit->get_first_visible_line() == 21);
-	CHECK(text_edit->get_v_scroll() == 21);
+	CHECK(text_edit->get_v_scroll() == v_offset + 21);
 	CHECK(text_edit->get_last_full_visible_line() == (visible_lines * 2) - 1);
 	CHECK(text_edit->get_last_full_visible_line_wrap_index() == 0);
 	CHECK(text_edit->get_caret_wrap_index() == 0);
@@ -7831,7 +7831,7 @@ TEST_CASE("[SceneTree][TextEdit] viewport") {
 	CHECK(text_edit->get_viewport()->is_input_handled());
 	CHECK(text_edit->get_caret_line() == 22);
 	CHECK(text_edit->get_first_visible_line() == 21);
-	CHECK(text_edit->get_v_scroll() == 21);
+	CHECK(text_edit->get_v_scroll() == v_offset + 21);
 	CHECK(text_edit->get_last_full_visible_line() == (visible_lines * 2) - 1);
 	CHECK(text_edit->get_last_full_visible_line_wrap_index() == 0);
 	CHECK(text_edit->get_caret_wrap_index() == 0);
diff --git a/tests/scene/test_viewport.h b/tests/scene/test_viewport.h
index 1341cc03..3ef309d8 100644
--- a/tests/scene/test_viewport.h
+++ b/tests/scene/test_viewport.h
@@ -31,13 +31,10 @@
 #ifndef TEST_VIEWPORT_H
 #define TEST_VIEWPORT_H
 
-#include "scene/2d/physics/area_2d.h"
-#include "scene/2d/physics/collision_shape_2d.h"
 #include "scene/gui/control.h"
 #include "scene/gui/subviewport_container.h"
 #include "scene/main/canvas_layer.h"
 #include "scene/main/window.h"
-#include "scene/resources/2d/rectangle_shape_2d.h"
 
 #include "tests/test_macros.h"
 
@@ -1393,423 +1390,6 @@ TEST_CASE("[SceneTree][Viewport] Control mouse cursor shape") {
 	}
 }
 
-class TestArea2D : public Area2D {
-	GDCLASS(TestArea2D, Area2D);
-
-	void _on_mouse_entered() {
-		enter_id = ++TestArea2D::counter; // > 0, if activated.
-	}
-
-	void _on_mouse_exited() {
-		exit_id = ++TestArea2D::counter; // > 0, if activated.
-	}
-
-	void _on_input_event(Node *p_vp, Ref<InputEvent> p_ev, int p_shape) {
-		last_input_event = p_ev;
-	}
-
-public:
-	static int counter;
-	int enter_id = 0;
-	int exit_id = 0;
-	Ref<InputEvent> last_input_event;
-
-	void init_signals() {
-		connect(SceneStringName(mouse_entered), callable_mp(this, &TestArea2D::_on_mouse_entered));
-		connect(SceneStringName(mouse_exited), callable_mp(this, &TestArea2D::_on_mouse_exited));
-		connect(SceneStringName(input_event), callable_mp(this, &TestArea2D::_on_input_event));
-	}
-
-	void test_reset() {
-		enter_id = 0;
-		exit_id = 0;
-		last_input_event.unref();
-	}
-};
-
-int TestArea2D::counter = 0;
-
-TEST_CASE("[SceneTree][Viewport] Physics Picking 2D") {
-	// FIXME: MOUSE_MODE_CAPTURED if-conditions are not testable, because DisplayServerMock doesn't support it.
-
-	struct PickingCollider {
-		TestArea2D *a;
-		CollisionShape2D *c;
-		Ref<RectangleShape2D> r;
-	};
-
-	SceneTree *tree = SceneTree::get_singleton();
-	Window *root = tree->get_root();
-	root->set_physics_object_picking(true);
-
-	Point2i on_background = Point2i(800, 800);
-	Point2i on_outside = Point2i(-1, -1);
-	SEND_GUI_MOUSE_MOTION_EVENT(on_background, MouseButtonMask::NONE, Key::NONE);
-	tree->physics_process(1);
-
-	Vector<PickingCollider> v;
-	for (int i = 0; i < 4; i++) {
-		PickingCollider pc;
-		pc.a = memnew(TestArea2D);
-		pc.c = memnew(CollisionShape2D);
-		pc.r = Ref<RectangleShape2D>(memnew(RectangleShape2D));
-		pc.r->set_size(Size2(150, 150));
-		pc.c->set_shape(pc.r);
-		pc.a->add_child(pc.c);
-		pc.a->set_name("A" + itos(i));
-		pc.c->set_name("C" + itos(i));
-		v.push_back(pc);
-		SIGNAL_WATCH(pc.a, SceneStringName(mouse_entered));
-		SIGNAL_WATCH(pc.a, SceneStringName(mouse_exited));
-	}
-
-	Node2D *node_a = memnew(Node2D);
-	node_a->set_position(Point2i(0, 0));
-	v[0].a->set_position(Point2i(0, 0));
-	v[1].a->set_position(Point2i(0, 100));
-	node_a->add_child(v[0].a);
-	node_a->add_child(v[1].a);
-	Node2D *node_b = memnew(Node2D);
-	node_b->set_position(Point2i(100, 0));
-	v[2].a->set_position(Point2i(0, 0));
-	v[3].a->set_position(Point2i(0, 100));
-	node_b->add_child(v[2].a);
-	node_b->add_child(v[3].a);
-	root->add_child(node_a);
-	root->add_child(node_b);
-	Point2i on_all = Point2i(50, 50);
-	Point2i on_0 = Point2i(10, 10);
-	Point2i on_01 = Point2i(10, 50);
-	Point2i on_02 = Point2i(50, 10);
-
-	Array empty_signal_args_2;
-	empty_signal_args_2.push_back(Array());
-	empty_signal_args_2.push_back(Array());
-
-	Array empty_signal_args_4;
-	empty_signal_args_4.push_back(Array());
-	empty_signal_args_4.push_back(Array());
-	empty_signal_args_4.push_back(Array());
-	empty_signal_args_4.push_back(Array());
-
-	for (PickingCollider E : v) {
-		E.a->init_signals();
-	}
-
-	SUBCASE("[Viewport][Picking2D] Mouse Motion") {
-		SEND_GUI_MOUSE_MOTION_EVENT(on_all, MouseButtonMask::NONE, Key::NONE);
-		tree->physics_process(1);
-		SIGNAL_CHECK(SceneStringName(mouse_entered), empty_signal_args_4);
-		SIGNAL_CHECK_FALSE(SceneStringName(mouse_exited));
-		for (PickingCollider E : v) {
-			CHECK(E.a->enter_id);
-			CHECK_FALSE(E.a->exit_id);
-			E.a->test_reset();
-		}
-
-		SEND_GUI_MOUSE_MOTION_EVENT(on_01, MouseButtonMask::NONE, Key::NONE);
-		tree->physics_process(1);
-		SIGNAL_CHECK_FALSE(SceneStringName(mouse_entered));
-		SIGNAL_CHECK(SceneStringName(mouse_exited), empty_signal_args_2);
-
-		for (int i = 0; i < v.size(); i++) {
-			CHECK_FALSE(v[i].a->enter_id);
-			if (i < 2) {
-				CHECK_FALSE(v[i].a->exit_id);
-			} else {
-				CHECK(v[i].a->exit_id);
-			}
-			v[i].a->test_reset();
-		}
-
-		SEND_GUI_MOUSE_MOTION_EVENT(on_outside, MouseButtonMask::NONE, Key::NONE);
-		tree->physics_process(1);
-		SIGNAL_CHECK_FALSE(SceneStringName(mouse_entered));
-		SIGNAL_CHECK(SceneStringName(mouse_exited), empty_signal_args_2);
-		for (int i = 0; i < v.size(); i++) {
-			CHECK_FALSE(v[i].a->enter_id);
-			if (i < 2) {
-				CHECK(v[i].a->exit_id);
-			} else {
-				CHECK_FALSE(v[i].a->exit_id);
-			}
-			v[i].a->test_reset();
-		}
-	}
-
-	SUBCASE("[Viewport][Picking2D] Object moved / passive hovering") {
-		SEND_GUI_MOUSE_MOTION_EVENT(on_all, MouseButtonMask::NONE, Key::NONE);
-		tree->physics_process(1);
-		for (int i = 0; i < v.size(); i++) {
-			CHECK(v[i].a->enter_id);
-			CHECK_FALSE(v[i].a->exit_id);
-			v[i].a->test_reset();
-		}
-
-		node_b->set_position(Point2i(200, 0));
-		tree->physics_process(1);
-		for (int i = 0; i < v.size(); i++) {
-			CHECK_FALSE(v[i].a->enter_id);
-			if (i < 2) {
-				CHECK_FALSE(v[i].a->exit_id);
-			} else {
-				CHECK(v[i].a->exit_id);
-			}
-			v[i].a->test_reset();
-		}
-
-		node_b->set_position(Point2i(100, 0));
-		tree->physics_process(1);
-		for (int i = 0; i < v.size(); i++) {
-			if (i < 2) {
-				CHECK_FALSE(v[i].a->enter_id);
-			} else {
-				CHECK(v[i].a->enter_id);
-			}
-			CHECK_FALSE(v[i].a->exit_id);
-			v[i].a->test_reset();
-		}
-	}
-
-	SUBCASE("[Viewport][Picking2D] No Processing") {
-		SEND_GUI_MOUSE_MOTION_EVENT(on_background, MouseButtonMask::NONE, Key::NONE);
-		tree->physics_process(1);
-		for (PickingCollider E : v) {
-			E.a->test_reset();
-		}
-
-		v[0].a->set_process_mode(Node::PROCESS_MODE_DISABLED);
-		v[0].c->set_process_mode(Node::PROCESS_MODE_DISABLED);
-		SEND_GUI_MOUSE_MOTION_EVENT(on_02, MouseButtonMask::NONE, Key::NONE);
-		tree->physics_process(1);
-		CHECK_FALSE(v[0].a->enter_id);
-		CHECK_FALSE(v[0].a->exit_id);
-		CHECK(v[2].a->enter_id);
-		CHECK_FALSE(v[2].a->exit_id);
-		for (PickingCollider E : v) {
-			E.a->test_reset();
-		}
-
-		SEND_GUI_MOUSE_MOTION_EVENT(on_background, MouseButtonMask::NONE, Key::NONE);
-		tree->physics_process(1);
-		CHECK_FALSE(v[0].a->enter_id);
-		CHECK_FALSE(v[0].a->exit_id);
-		CHECK_FALSE(v[2].a->enter_id);
-		CHECK(v[2].a->exit_id);
-
-		for (PickingCollider E : v) {
-			E.a->test_reset();
-		}
-		v[0].a->set_process_mode(Node::PROCESS_MODE_ALWAYS);
-		v[0].c->set_process_mode(Node::PROCESS_MODE_ALWAYS);
-	}
-
-	SUBCASE("[Viewport][Picking2D] Multiple events in series") {
-		SEND_GUI_MOUSE_MOTION_EVENT(on_0, MouseButtonMask::NONE, Key::NONE);
-		SEND_GUI_MOUSE_MOTION_EVENT(on_0 + Point2i(10, 0), MouseButtonMask::NONE, Key::NONE);
-		tree->physics_process(1);
-
-		for (int i = 0; i < v.size(); i++) {
-			if (i < 1) {
-				CHECK(v[i].a->enter_id);
-			} else {
-				CHECK_FALSE(v[i].a->enter_id);
-			}
-			CHECK_FALSE(v[i].a->exit_id);
-			v[i].a->test_reset();
-		}
-
-		SEND_GUI_MOUSE_MOTION_EVENT(on_background, MouseButtonMask::NONE, Key::NONE);
-		SEND_GUI_MOUSE_MOTION_EVENT(on_background + Point2i(10, 10), MouseButtonMask::NONE, Key::NONE);
-		tree->physics_process(1);
-
-		for (int i = 0; i < v.size(); i++) {
-			CHECK_FALSE(v[i].a->enter_id);
-			if (i < 1) {
-				CHECK(v[i].a->exit_id);
-			} else {
-				CHECK_FALSE(v[i].a->exit_id);
-			}
-			v[i].a->test_reset();
-		}
-	}
-
-	SUBCASE("[Viewport][Picking2D] Disable Picking") {
-		SEND_GUI_MOUSE_MOTION_EVENT(on_02, MouseButtonMask::NONE, Key::NONE);
-
-		root->set_physics_object_picking(false);
-		CHECK_FALSE(root->get_physics_object_picking());
-
-		tree->physics_process(1);
-
-		for (int i = 0; i < v.size(); i++) {
-			CHECK_FALSE(v[i].a->enter_id);
-			v[i].a->test_reset();
-		}
-
-		root->set_physics_object_picking(true);
-		CHECK(root->get_physics_object_picking());
-	}
-
-	SUBCASE("[Viewport][Picking2D] CollisionObject in CanvasLayer") {
-		CanvasLayer *node_c = memnew(CanvasLayer);
-		node_c->set_rotation(Math_PI);
-		node_c->set_offset(Point2i(100, 100));
-		root->add_child(node_c);
-
-		v[2].a->reparent(node_c, false);
-		v[3].a->reparent(node_c, false);
-
-		SEND_GUI_MOUSE_MOTION_EVENT(on_02, MouseButtonMask::NONE, Key::NONE);
-		tree->physics_process(1);
-
-		for (int i = 0; i < v.size(); i++) {
-			if (i == 0 || i == 3) {
-				CHECK(v[i].a->enter_id);
-			} else {
-				CHECK_FALSE(v[i].a->enter_id);
-			}
-			v[i].a->test_reset();
-		}
-
-		v[2].a->reparent(node_b, false);
-		v[3].a->reparent(node_b, false);
-		root->remove_child(node_c);
-		memdelete(node_c);
-	}
-
-	SUBCASE("[Viewport][Picking2D] Picking Sort") {
-		root->set_physics_object_picking_sort(true);
-		CHECK(root->get_physics_object_picking_sort());
-
-		SUBCASE("[Viewport][Picking2D] Picking Sort Z-Index") {
-			node_a->set_z_index(10);
-			v[0].a->set_z_index(0);
-			v[1].a->set_z_index(2);
-			node_b->set_z_index(5);
-			v[2].a->set_z_index(8);
-			v[3].a->set_z_index(11);
-			v[3].a->set_z_as_relative(false);
-
-			TestArea2D::counter = 0;
-			SEND_GUI_MOUSE_MOTION_EVENT(on_all, MouseButtonMask::NONE, Key::NONE);
-			tree->physics_process(1);
-
-			CHECK(v[0].a->enter_id == 4);
-			CHECK(v[1].a->enter_id == 2);
-			CHECK(v[2].a->enter_id == 1);
-			CHECK(v[3].a->enter_id == 3);
-			for (int i = 0; i < v.size(); i++) {
-				CHECK_FALSE(v[i].a->exit_id);
-				v[i].a->test_reset();
-			}
-
-			TestArea2D::counter = 0;
-			SEND_GUI_MOUSE_MOTION_EVENT(on_background, MouseButtonMask::NONE, Key::NONE);
-			tree->physics_process(1);
-
-			CHECK(v[0].a->exit_id == 4);
-			CHECK(v[1].a->exit_id == 2);
-			CHECK(v[2].a->exit_id == 1);
-			CHECK(v[3].a->exit_id == 3);
-			for (int i = 0; i < v.size(); i++) {
-				CHECK_FALSE(v[i].a->enter_id);
-				v[i].a->set_z_as_relative(true);
-				v[i].a->set_z_index(0);
-				v[i].a->test_reset();
-			}
-
-			node_a->set_z_index(0);
-			node_b->set_z_index(0);
-		}
-
-		SUBCASE("[Viewport][Picking2D] Picking Sort Scene Tree Location") {
-			TestArea2D::counter = 0;
-			SEND_GUI_MOUSE_MOTION_EVENT(on_all, MouseButtonMask::NONE, Key::NONE);
-			tree->physics_process(1);
-
-			for (int i = 0; i < v.size(); i++) {
-				CHECK(v[i].a->enter_id == 4 - i);
-				CHECK_FALSE(v[i].a->exit_id);
-				v[i].a->test_reset();
-			}
-
-			TestArea2D::counter = 0;
-			SEND_GUI_MOUSE_MOTION_EVENT(on_background, MouseButtonMask::NONE, Key::NONE);
-			tree->physics_process(1);
-
-			for (int i = 0; i < v.size(); i++) {
-				CHECK_FALSE(v[i].a->enter_id);
-				CHECK(v[i].a->exit_id == 4 - i);
-				v[i].a->test_reset();
-			}
-		}
-
-		root->set_physics_object_picking_sort(false);
-		CHECK_FALSE(root->get_physics_object_picking_sort());
-	}
-
-	SUBCASE("[Viewport][Picking2D] Mouse Button") {
-		SEND_GUI_MOUSE_BUTTON_EVENT(on_0, MouseButton::LEFT, MouseButtonMask::LEFT, Key::NONE);
-		tree->physics_process(1);
-
-		for (int i = 0; i < v.size(); i++) {
-			if (i == 0) {
-				CHECK(v[i].a->enter_id);
-			} else {
-				CHECK_FALSE(v[i].a->enter_id);
-			}
-			CHECK_FALSE(v[i].a->exit_id);
-			v[i].a->test_reset();
-		}
-
-		SEND_GUI_MOUSE_BUTTON_RELEASED_EVENT(on_0, MouseButton::LEFT, MouseButtonMask::NONE, Key::NONE);
-		tree->physics_process(1);
-
-		for (int i = 0; i < v.size(); i++) {
-			CHECK_FALSE(v[i].a->enter_id);
-			CHECK_FALSE(v[i].a->exit_id);
-			v[i].a->test_reset();
-		}
-	}
-
-	SUBCASE("[Viewport][Picking2D] Screen Touch") {
-		SEND_GUI_TOUCH_EVENT(on_01, true, false);
-		tree->physics_process(1);
-		for (int i = 0; i < v.size(); i++) {
-			if (i < 2) {
-				Ref<InputEventScreenTouch> st = v[i].a->last_input_event;
-				CHECK(st.is_valid());
-			} else {
-				CHECK(v[i].a->last_input_event.is_null());
-			}
-			v[i].a->test_reset();
-		}
-	}
-
-	for (PickingCollider E : v) {
-		SIGNAL_UNWATCH(E.a, SceneStringName(mouse_entered));
-		SIGNAL_UNWATCH(E.a, SceneStringName(mouse_exited));
-		memdelete(E.c);
-		memdelete(E.a);
-	}
-}
-
-TEST_CASE("[SceneTree][Viewport] Embedded Windows") {
-	Window *root = SceneTree::get_singleton()->get_root();
-	Window *w = memnew(Window);
-
-	SUBCASE("[Viewport] Safe-rect of embedded Window") {
-		root->add_child(w);
-		root->subwindow_set_popup_safe_rect(w, Rect2i(10, 10, 10, 10));
-		CHECK_EQ(root->subwindow_get_popup_safe_rect(w), Rect2i(10, 10, 10, 10));
-		root->remove_child(w);
-		CHECK_EQ(root->subwindow_get_popup_safe_rect(w), Rect2i());
-	}
-
-	memdelete(w);
-}
-
 } // namespace TestViewport
 
 #endif // TEST_VIEWPORT_H
diff --git a/tests/test_macros.h b/tests/test_macros.h
index 14d46350..d60866ad 100644
--- a/tests/test_macros.h
+++ b/tests/test_macros.h
@@ -97,7 +97,6 @@ DOCTEST_STRINGIFY_VARIANT(Transform2D);
 DOCTEST_STRINGIFY_VARIANT(Plane);
 DOCTEST_STRINGIFY_VARIANT(AABB);
 DOCTEST_STRINGIFY_VARIANT(Basis);
-DOCTEST_STRINGIFY_VARIANT(Transform3D);
 
 DOCTEST_STRINGIFY_VARIANT(::Color); // Disambiguate from `doctest::Color`.
 DOCTEST_STRINGIFY_VARIANT(StringName);
@@ -118,7 +117,6 @@ DOCTEST_STRINGIFY_VARIANT(PackedStringArray);
 DOCTEST_STRINGIFY_VARIANT(PackedVector2Array);
 DOCTEST_STRINGIFY_VARIANT(PackedVector3Array);
 DOCTEST_STRINGIFY_VARIANT(PackedColorArray);
-DOCTEST_STRINGIFY_VARIANT(PackedVector4Array);
 
 // Register test commands to be launched from the command-line.
 // For instance: REGISTER_TEST_COMMAND("gdscript-parser" &test_parser_func).
diff --git a/tests/test_main.cpp b/tests/test_main.cpp
index 50c89bac..2f22b000 100644
--- a/tests/test_main.cpp
+++ b/tests/test_main.cpp
@@ -54,7 +54,6 @@
 #include "tests/core/io/test_resource.h"
 #include "tests/core/io/test_xml_parser.h"
 #include "tests/core/math/test_aabb.h"
-#include "tests/core/math/test_astar.h"
 #include "tests/core/math/test_basis.h"
 #include "tests/core/math/test_color.h"
 #include "tests/core/math/test_expression.h"
@@ -100,7 +99,6 @@
 #include "tests/core/variant/test_variant.h"
 #include "tests/core/variant/test_variant_utility.h"
 #include "tests/scene/test_animation.h"
-#include "tests/scene/test_audio_stream_wav.h"
 #include "tests/scene/test_bit_map.h"
 #include "tests/scene/test_button.h"
 #include "tests/scene/test_camera_2d.h"
@@ -122,7 +120,9 @@
 #include "tests/scene/test_theme.h"
 #include "tests/scene/test_timer.h"
 #include "tests/scene/test_viewport.h"
+#ifndef VISUAL_SHADER_DISABLED
 #include "tests/scene/test_visual_shader.h"
+#endif
 #include "tests/scene/test_window.h"
 #include "tests/servers/rendering/test_shader_preprocessor.h"
 #include "tests/servers/test_text_server.h"
@@ -266,15 +266,6 @@ struct GodotTestCaseListener : public doctest::IReporter {
 
 			return;
 		}
-
-		if (name.contains("[Audio]")) {
-			// The last driver index should always be the dummy driver.
-			int dummy_idx = AudioDriverManager::get_driver_count() - 1;
-			AudioDriverManager::initialize(dummy_idx);
-			AudioServer *audio_server = memnew(AudioServer);
-			audio_server->init();
-			return;
-		}
 	}
 
 	void test_case_end(const doctest::CurrentTestCaseStats &) override {
@@ -325,11 +316,6 @@ struct GodotTestCaseListener : public doctest::IReporter {
 			MessageQueue::get_singleton()->flush();
 			memdelete(MessageQueue::get_singleton());
 		}
-
-		if (AudioServer::get_singleton()) {
-			AudioServer::get_singleton()->finish();
-			memdelete(AudioServer::get_singleton());
-		}
 	}
 
 	void test_run_start() override {
diff --git a/tests/test_validate_testing.h b/tests/test_validate_testing.h
index 90f0b499..398cd3e7 100644
--- a/tests/test_validate_testing.h
+++ b/tests/test_validate_testing.h
@@ -89,12 +89,6 @@ TEST_SUITE("Validate tests") {
 		AABB aabb(Vector3(), Vector3(100, 100, 100));
 		INFO(aabb);
 
-		Basis basis(quat);
-		INFO(basis);
-
-		Transform3D trans(basis);
-		INFO(trans);
-
 		Color color(1, 0.5, 0.2, 0.3);
 		INFO(color);
 
@@ -178,13 +172,6 @@ TEST_SUITE("Validate tests") {
 		color_arr.push_back(Color(2, 2, 2));
 		INFO(color_arr);
 
-		PackedVector4Array vec4_arr;
-		vec4_arr.push_back(Vector4(0, 0, 0, 0));
-		vec4_arr.push_back(Vector4(1, 1, 1, 1));
-		vec4_arr.push_back(Vector4(2, 2, 2, 2));
-		vec4_arr.push_back(Vector4(3, 3, 3, 3));
-		INFO(vec4_arr);
-
 		// doctest string concatenation.
 		CHECK_MESSAGE(true, var, " ", vec2, " ", rect2, " ", color);
 	}