diff --git a/tests/FileManipulation/MissingReturnTypeTest.php b/tests/FileManipulation/MissingReturnTypeTest.php
new file mode 100644
index 000000000..0b7fb0a75
--- /dev/null
+++ b/tests/FileManipulation/MissingReturnTypeTest.php
@@ -0,0 +1,851 @@
+<?php
+namespace Psalm\Tests\FileManipulation;
+
+class MissingReturnTypeTest extends FileManipulationTest
+{
+    /**
+     * @return array<string,array{string,string,string,string[],bool,5?:bool}>
+     */
+    public function providerValidCodeParse()
+    {
+        return [
+            'addMissingVoidReturnType56' => [
+                '<?php
+                    function foo() { }',
+                '<?php
+                    /**
+                     * @return void
+                     */
+                    function foo() { }',
+                '5.6',
+                ['MissingReturnType'],
+                true,
+            ],
+            'addMissingVoidReturnType70' => [
+                '<?php
+                    function foo() { }',
+                '<?php
+                    /**
+                     * @return void
+                     */
+                    function foo() { }',
+                '7.0',
+                ['MissingReturnType'],
+                true,
+            ],
+            'addMissingVoidReturnType71' => [
+                '<?php
+                    function foo() { }',
+                '<?php
+                    function foo(): void { }',
+                '7.1',
+                ['MissingReturnType'],
+                true,
+            ],
+            'addMissingStringReturnType56' => [
+                '<?php
+                    function foo() {
+                        return "hello";
+                    }',
+                '<?php
+                    /**
+                     * @return string
+                     */
+                    function foo() {
+                        return "hello";
+                    }',
+                '5.6',
+                ['MissingReturnType'],
+                true,
+            ],
+            'addMissingStringReturnType70' => [
+                '<?php
+                    function foo() {
+                        return "hello";
+                    }',
+                '<?php
+                    function foo(): string {
+                        return "hello";
+                    }',
+                '7.0',
+                ['MissingReturnType'],
+                true,
+            ],
+            'addMissingNullableStringReturnType56' => [
+                '<?php
+                    function foo() {
+                        return rand(0, 1) ? "hello" : null;
+                    }',
+                '<?php
+                    /**
+                     * @return null|string
+                     */
+                    function foo() {
+                        return rand(0, 1) ? "hello" : null;
+                    }',
+                '5.6',
+                ['MissingReturnType'],
+                true,
+            ],
+            'addMissingNullableStringReturnType70' => [
+                '<?php
+                    function foo() {
+                        return rand(0, 1) ? "hello" : null;
+                    }',
+                '<?php
+                    /**
+                     * @return null|string
+                     */
+                    function foo() {
+                        return rand(0, 1) ? "hello" : null;
+                    }',
+                '7.0',
+                ['MissingReturnType'],
+                true,
+            ],
+            'addMissingStringReturnType71' => [
+                '<?php
+                    function foo() {
+                        return rand(0, 1) ? "hello" : null;
+                    }',
+                '<?php
+                    function foo(): ?string {
+                        return rand(0, 1) ? "hello" : null;
+                    }',
+                '7.1',
+                ['MissingReturnType'],
+                true,
+            ],
+            'addMissingStringReturnTypeWithComment71' => [
+                '<?php
+                    function foo() /** : ?string */ {
+                        return rand(0, 1) ? "hello" : null;
+                    }',
+                '<?php
+                    function foo(): ?string /** : ?string */ {
+                        return rand(0, 1) ? "hello" : null;
+                    }',
+                '7.1',
+                ['MissingReturnType'],
+                true,
+            ],
+            'addMissingStringReturnTypeWithSingleLineComment71' => [
+                '<?php
+                    function foo()// cool
+                    {
+                        return rand(0, 1) ? "hello" : null;
+                    }',
+                '<?php
+                    function foo(): ?string// cool
+                    {
+                        return rand(0, 1) ? "hello" : null;
+                    }',
+                '7.1',
+                ['MissingReturnType'],
+                true,
+            ],
+            'addMissingStringArrayReturnType56' => [
+                '<?php
+                    function foo() {
+                        return ["hello"];
+                    }',
+                '<?php
+                    /**
+                     * @return string[]
+                     *
+                     * @psalm-return array{0: string}
+                     */
+                    function foo() {
+                        return ["hello"];
+                    }',
+                '5.6',
+                ['MissingReturnType'],
+                true,
+            ],
+            'addMissingStringArrayReturnType70' => [
+                '<?php
+                    function foo() {
+                        return ["hello"];
+                    }',
+                '<?php
+                    /**
+                     * @return string[]
+                     *
+                     * @psalm-return array{0: string}
+                     */
+                    function foo(): array {
+                        return ["hello"];
+                    }',
+                '7.0',
+                ['MissingReturnType'],
+                true,
+            ],
+            'addMissingObjectLikeReturnType70' => [
+                '<?php
+                    function foo() {
+                        return rand(0, 1) ? ["a" => "hello"] : ["a" => "goodbye", "b" => "hello again"];
+                    }',
+                '<?php
+                    /**
+                     * @return string[]
+                     *
+                     * @psalm-return array{a: string, b?: string}
+                     */
+                    function foo(): array {
+                        return rand(0, 1) ? ["a" => "hello"] : ["a" => "goodbye", "b" => "hello again"];
+                    }',
+                '7.0',
+                ['MissingReturnType'],
+                true,
+            ],
+            'addMissingObjectLikeReturnTypeWithEmptyArray' => [
+                '<?php
+                    function foo() {
+                        if (rand(0, 1)) {
+                            return [];
+                        }
+
+                        return [
+                            "a" => 1,
+                            "b" => 2,
+                        ];
+                    }',
+                '<?php
+                    /**
+                     * @return int[]
+                     *
+                     * @psalm-return array{a?: int, b?: int}
+                     */
+                    function foo(): array {
+                        if (rand(0, 1)) {
+                            return [];
+                        }
+
+                        return [
+                            "a" => 1,
+                            "b" => 2,
+                        ];
+                    }',
+                '7.0',
+                ['MissingReturnType'],
+                true,
+            ],
+            'addMissingObjectLikeReturnTypeWithNestedArrays' => [
+                '<?php
+                    function foo() {
+                        return [
+                            "a" => 1,
+                            "b" => 2,
+                            "c" => [
+                                "a" => 1,
+                                "b" => 2,
+                                "c" => [
+                                    "a" => 1,
+                                    "b" => 2,
+                                    "c" => 3,
+                                ],
+                            ],
+                        ];
+                    }',
+                '<?php
+                    /**
+                     * @return ((int|int[])[]|int)[]
+                     *
+                     * @psalm-return array{a: int, b: int, c: array{a: int, b: int, c: array{a: int, b: int, c: int}}}
+                     */
+                    function foo(): array {
+                        return [
+                            "a" => 1,
+                            "b" => 2,
+                            "c" => [
+                                "a" => 1,
+                                "b" => 2,
+                                "c" => [
+                                    "a" => 1,
+                                    "b" => 2,
+                                    "c" => 3,
+                                ],
+                            ],
+                        ];
+                    }',
+                '7.0',
+                ['MissingReturnType'],
+                true,
+            ],
+            'addMissingObjectLikeReturnTypeSeparateStatements70' => [
+                '<?php
+                    function foo() {
+                        if (rand(0, 1)) {
+                            return ["a" => "hello", "b" => "hello again"];
+                        }
+
+                        if (rand(0, 1)) {
+                            return ["a" => "hello", "b" => "hello again"];
+                        }
+
+                        return ["a" => "goodbye"];
+                    }',
+                '<?php
+                    /**
+                     * @return string[]
+                     *
+                     * @psalm-return array{a: string, b?: string}
+                     */
+                    function foo(): array {
+                        if (rand(0, 1)) {
+                            return ["a" => "hello", "b" => "hello again"];
+                        }
+
+                        if (rand(0, 1)) {
+                            return ["a" => "hello", "b" => "hello again"];
+                        }
+
+                        return ["a" => "goodbye"];
+                    }',
+                '7.0',
+                ['MissingReturnType'],
+                true,
+            ],
+            'addMissingStringArrayReturnTypeFromCall71' => [
+                '<?php
+                    /** @return string[] */
+                    function foo(): array {
+                        return ["hello"];
+                    }
+
+                    function bar() {
+                        return foo();
+                    }',
+                '<?php
+                    /** @return string[] */
+                    function foo(): array {
+                        return ["hello"];
+                    }
+
+                    /**
+                     * @return string[]
+                     *
+                     * @psalm-return array<array-key, string>
+                     */
+                    function bar(): array {
+                        return foo();
+                    }',
+                '7.1',
+                ['MissingReturnType'],
+                true,
+            ],
+            'addMissingDocblockStringArrayReturnTypeFromCall71' => [
+                '<?php
+                    /** @return string[] */
+                    function foo() {
+                        return ["hello"];
+                    }
+
+                    function bar() {
+                        return foo();
+                    }',
+                '<?php
+                    /** @return string[] */
+                    function foo() {
+                        return ["hello"];
+                    }
+
+                    /**
+                     * @return string[]
+                     *
+                     * @psalm-return array<array-key, string>
+                     */
+                    function bar() {
+                        return foo();
+                    }',
+                '7.1',
+                ['MissingReturnType'],
+                true,
+            ],
+            'addMissingNullableStringReturnType71' => [
+                '<?php
+                    /** @return string[] */
+                    function foo(): array {
+                        return ["hello"];
+                    }
+
+                    function bar() {
+                        foreach (foo() as $f) {
+                            return $f;
+                        }
+                        return null;
+                    }',
+                '<?php
+                    /** @return string[] */
+                    function foo(): array {
+                        return ["hello"];
+                    }
+
+                    /**
+                     * @return null|string
+                     */
+                    function bar() {
+                        foreach (foo() as $f) {
+                            return $f;
+                        }
+                        return null;
+                    }',
+                '7.1',
+                ['MissingReturnType'],
+                true,
+            ],
+            'addMissingNullableStringReturnTypeWithMaybeReturn71' => [
+                '<?php
+                    function foo() {
+                      if (rand(0, 1)) return new stdClass;
+                    }',
+                '<?php
+                    /**
+                     * @return null|stdClass
+                     */
+                    function foo() {
+                      if (rand(0, 1)) return new stdClass;
+                    }',
+                '7.1',
+                ['MissingReturnType'],
+                true,
+            ],
+            'addMissingUnsafeNullableStringReturnType71' => [
+                '<?php
+                    /** @return string[] */
+                    function foo(): array {
+                        return ["hello"];
+                    }
+
+                    function bar() {
+                        foreach (foo() as $f) {
+                            return $f;
+                        }
+                        return null;
+                    }',
+                '<?php
+                    /** @return string[] */
+                    function foo(): array {
+                        return ["hello"];
+                    }
+
+                    function bar(): ?string {
+                        foreach (foo() as $f) {
+                            return $f;
+                        }
+                        return null;
+                    }',
+                '7.1',
+                ['MissingReturnType'],
+                false,
+            ],
+            'addSelfReturnType' => [
+                '<?php
+                    class A {
+                        public function foo() {
+                            return $this;
+                        }
+                    }',
+                '<?php
+                    class A {
+                        public function foo(): self {
+                            return $this;
+                        }
+                    }',
+                '7.1',
+                ['MissingReturnType'],
+                false,
+            ],
+            'addIterableReturnType' => [
+                '<?php
+                    function foo() {
+                        return bar();
+                    }
+
+                    function bar(): iterable {
+                        return [1, 2, 3];
+                    }',
+                '<?php
+                    function foo(): iterable {
+                        return bar();
+                    }
+
+                    function bar(): iterable {
+                        return [1, 2, 3];
+                    }',
+                '7.1',
+                ['MissingReturnType'],
+                false,
+            ],
+            'addGenericIterableReturnType' => [
+                '<?php
+                    function foo() {
+                        return bar();
+                    }
+
+                    /** @return iterable<int> */
+                    function bar(): iterable {
+                        return [1, 2, 3];
+                    }',
+                '<?php
+                    /**
+                     * @return iterable
+                     *
+                     * @psalm-return iterable<mixed, int>
+                     */
+                    function foo(): iterable {
+                        return bar();
+                    }
+
+                    /** @return iterable<int> */
+                    function bar(): iterable {
+                        return [1, 2, 3];
+                    }',
+                '7.1',
+                ['MissingReturnType'],
+                false,
+            ],
+            'addMissingNullableReturnTypeInDocblockOnly71' => [
+                '<?php
+                    function foo() {
+                      if (rand(0, 1)) {
+                        return;
+                      }
+
+                      return "hello";
+                    }
+
+                    function bar() {
+                      if (rand(0, 1)) {
+                        return;
+                      }
+
+                      if (rand(0, 1)) {
+                        return null;
+                      }
+
+                      return "hello";
+                    }',
+                '<?php
+                    /**
+                     * @return null|string
+                     */
+                    function foo() {
+                      if (rand(0, 1)) {
+                        return;
+                      }
+
+                      return "hello";
+                    }
+
+                    /**
+                     * @return null|string
+                     */
+                    function bar() {
+                      if (rand(0, 1)) {
+                        return;
+                      }
+
+                      if (rand(0, 1)) {
+                        return null;
+                      }
+
+                      return "hello";
+                    }',
+                '7.1',
+                ['MissingReturnType'],
+                false,
+            ],
+            'addMissingVoidReturnTypeToOldArray71' => [
+                '<?php
+                    function foo(array $a = array()) {}
+                    function bar(array $a = array() )  {}',
+                '<?php
+                    function foo(array $a = array()): void {}
+                    function bar(array $a = array() ): void  {}',
+                '7.1',
+                ['MissingReturnType'],
+                false,
+            ],
+            'dontAddMissingVoidReturnType56' => [
+                '<?php
+                    /** @return void */
+                    function foo() { }
+
+                    function bar() {
+                        return foo();
+                    }',
+                '<?php
+                    /** @return void */
+                    function foo() { }
+
+                    function bar() {
+                        return foo();
+                    }',
+                '5.6',
+                ['MissingReturnType'],
+                true,
+            ],
+            'dontAddMissingVoidReturnTypehintForSubclass71' => [
+                '<?php
+                    class A {
+                        public function foo() {}
+                    }
+
+                    class B extends A {
+                        public function foo() {}
+                    }',
+                '<?php
+                    class A {
+                        /**
+                         * @return void
+                         */
+                        public function foo() {}
+                    }
+
+                    class B extends A {
+                        /**
+                         * @return void
+                         */
+                        public function foo() {}
+                    }',
+                '7.1',
+                ['MissingReturnType'],
+                true,
+            ],
+            'dontAddMissingVoidReturnTypehintForPrivateMethodInSubclass71' => [
+                '<?php
+                    class A {
+                        private function foo() {}
+                    }
+
+                    class B extends A {
+                        private function foo() {}
+                    }',
+                '<?php
+                    class A {
+                        private function foo(): void {}
+                    }
+
+                    class B extends A {
+                        private function foo(): void {}
+                    }',
+                '7.1',
+                ['MissingReturnType'],
+                true,
+            ],
+            'dontAddMissingClassReturnTypehintForSubclass71' => [
+                '<?php
+                    class A {
+                        public function foo() {
+                            return $this;
+                        }
+                    }
+
+                    class B extends A {
+                        public function foo() {
+                            return $this;
+                        }
+                    }',
+                '<?php
+                    class A {
+                        /**
+                         * @return self
+                         */
+                        public function foo() {
+                            return $this;
+                        }
+                    }
+
+                    class B extends A {
+                        /**
+                         * @return self
+                         */
+                        public function foo() {
+                            return $this;
+                        }
+                    }',
+                '7.1',
+                ['MissingReturnType'],
+                true,
+            ],
+            'dontAddMissingClassReturnTypehintForSubSubclass71' => [
+                '<?php
+                    class A {
+                        public function foo() {
+                            return $this;
+                        }
+                    }
+
+                    class B extends A {}
+
+                    class C extends B {
+                        public function foo() {
+                            return $this;
+                        }
+                    }',
+                '<?php
+                    class A {
+                        /**
+                         * @return self
+                         */
+                        public function foo() {
+                            return $this;
+                        }
+                    }
+
+                    class B extends A {}
+
+                    class C extends B {
+                        /**
+                         * @return self
+                         */
+                        public function foo() {
+                            return $this;
+                        }
+                    }',
+                '7.1',
+                ['MissingReturnType'],
+                true,
+            ],
+            'addMissingTemplateReturnType' => [
+                '<?php
+                    /**
+                     * @template T as object
+                     *
+                     * @param object $t Flabble
+                     *
+                     * @psalm-param T $t
+                     */
+                    function foo($t) {
+                        return $t;
+                    }',
+                '<?php
+                    /**
+                     * @template T as object
+                     *
+                     * @param object $t Flabble
+                     *
+                     * @psalm-param T $t
+                     *
+                     * @return object
+                     *
+                     * @psalm-return T
+                     */
+                    function foo($t) {
+                        return $t;
+                    }',
+                '7.4',
+                ['MissingReturnType'],
+                true
+            ],
+            'missingReturnTypeAnonymousClass' => [
+                '<?php
+                    function logger() {
+                        return new class {};
+                    }',
+                '<?php
+                    function logger(): object {
+                        return new class {};
+                    }',
+                '7.4',
+                ['MissingReturnType'],
+                true
+            ],
+            'missingReturnTypeAnonymousClassPre72' => [
+                '<?php
+                    function logger() {
+                        return new class {};
+                    }',
+                '<?php
+                    /**
+                     * @return object
+                     */
+                    function logger() {
+                        return new class {};
+                    }',
+                '7.1',
+                ['MissingReturnType'],
+                true
+            ],
+            'addMissingReturnTypeWhenParentHasNone' => [
+                '<?php
+                    class A {
+                        /** @psalm-suppress MissingReturnType */
+                        public function foo() {
+                            return;
+                        }
+                    }
+
+                    class B extends A {
+                        public function foo() {
+                            return;
+                        }
+                    }',
+                '<?php
+                    class A {
+                        /** @psalm-suppress MissingReturnType */
+                        public function foo() {
+                            return;
+                        }
+                    }
+
+                    class B extends A {
+                        /**
+                         * @return void
+                         */
+                        public function foo() {
+                            return;
+                        }
+                    }',
+                '7.1',
+                ['MissingReturnType'],
+                false,
+            ],
+            'dontAddMissingReturnTypeWhenChildHasNone' => [
+                '<?php
+                    class A {
+                        public function foo() {}
+                    }
+
+                    class B extends A {
+                        /** @psalm-suppress MissingReturnType */
+                        public function foo() {}
+                    }',
+                '<?php
+                    class A {
+                        /**
+                         * @return void
+                         */
+                        public function foo() {}
+                    }
+
+                    class B extends A {
+                        /** @psalm-suppress MissingReturnType */
+                        public function foo() {}
+                    }',
+                '7.1',
+                ['MissingReturnType'],
+                false,
+            ],
+            'noEmptyArrayAnnotation' => [
+                '<?php
+                    function foo() {
+                        return [];
+                    }',
+                '<?php
+                    /**
+                     * @return array
+                     *
+                     * @psalm-return array<empty, empty>
+                     */
+                    function foo(): array {
+                        return [];
+                    }',
+                '7.3',
+                ['MissingReturnType'],
+                false,
+            ],
+        ];
+    }
+}
diff --git a/tests/FileManipulation/ReturnTypeManipulationTest.php b/tests/FileManipulation/ReturnTypeManipulationTest.php
index 2709ae52b..96307f4b9 100644
--- a/tests/FileManipulation/ReturnTypeManipulationTest.php
+++ b/tests/FileManipulation/ReturnTypeManipulationTest.php
@@ -9,68 +9,6 @@ class ReturnTypeManipulationTest extends FileManipulationTest
     public function providerValidCodeParse()
     {
         return [
-            'addMissingVoidReturnType56' => [
-                '<?php
-                    function foo() { }',
-                '<?php
-                    /**
-                     * @return void
-                     */
-                    function foo() { }',
-                '5.6',
-                ['MissingReturnType'],
-                true,
-            ],
-            'addMissingVoidReturnType70' => [
-                '<?php
-                    function foo() { }',
-                '<?php
-                    /**
-                     * @return void
-                     */
-                    function foo() { }',
-                '7.0',
-                ['MissingReturnType'],
-                true,
-            ],
-            'addMissingVoidReturnType71' => [
-                '<?php
-                    function foo() { }',
-                '<?php
-                    function foo(): void { }',
-                '7.1',
-                ['MissingReturnType'],
-                true,
-            ],
-            'addMissingStringReturnType56' => [
-                '<?php
-                    function foo() {
-                        return "hello";
-                    }',
-                '<?php
-                    /**
-                     * @return string
-                     */
-                    function foo() {
-                        return "hello";
-                    }',
-                '5.6',
-                ['MissingReturnType'],
-                true,
-            ],
-            'addMissingStringReturnType70' => [
-                '<?php
-                    function foo() {
-                        return "hello";
-                    }',
-                '<?php
-                    function foo(): string {
-                        return "hello";
-                    }',
-                '7.0',
-                ['MissingReturnType'],
-                true,
-            ],
             'addMissingClosureStringReturnType56' => [
                 '<?php
                     $a = function() {
@@ -87,502 +25,6 @@ class ReturnTypeManipulationTest extends FileManipulationTest
                 ['MissingClosureReturnType'],
                 true,
             ],
-            'addMissingNullableStringReturnType56' => [
-                '<?php
-                    function foo() {
-                        return rand(0, 1) ? "hello" : null;
-                    }',
-                '<?php
-                    /**
-                     * @return null|string
-                     */
-                    function foo() {
-                        return rand(0, 1) ? "hello" : null;
-                    }',
-                '5.6',
-                ['MissingReturnType'],
-                true,
-            ],
-            'addMissingNullableStringReturnType70' => [
-                '<?php
-                    function foo() {
-                        return rand(0, 1) ? "hello" : null;
-                    }',
-                '<?php
-                    /**
-                     * @return null|string
-                     */
-                    function foo() {
-                        return rand(0, 1) ? "hello" : null;
-                    }',
-                '7.0',
-                ['MissingReturnType'],
-                true,
-            ],
-            'addMissingStringReturnType71' => [
-                '<?php
-                    function foo() {
-                        return rand(0, 1) ? "hello" : null;
-                    }',
-                '<?php
-                    function foo(): ?string {
-                        return rand(0, 1) ? "hello" : null;
-                    }',
-                '7.1',
-                ['MissingReturnType'],
-                true,
-            ],
-            'addMissingStringReturnTypeWithComment71' => [
-                '<?php
-                    function foo() /** : ?string */ {
-                        return rand(0, 1) ? "hello" : null;
-                    }',
-                '<?php
-                    function foo(): ?string /** : ?string */ {
-                        return rand(0, 1) ? "hello" : null;
-                    }',
-                '7.1',
-                ['MissingReturnType'],
-                true,
-            ],
-            'addMissingStringReturnTypeWithSingleLineComment71' => [
-                '<?php
-                    function foo()// cool
-                    {
-                        return rand(0, 1) ? "hello" : null;
-                    }',
-                '<?php
-                    function foo(): ?string// cool
-                    {
-                        return rand(0, 1) ? "hello" : null;
-                    }',
-                '7.1',
-                ['MissingReturnType'],
-                true,
-            ],
-            'addMissingStringArrayReturnType56' => [
-                '<?php
-                    function foo() {
-                        return ["hello"];
-                    }',
-                '<?php
-                    /**
-                     * @return string[]
-                     *
-                     * @psalm-return array{0: string}
-                     */
-                    function foo() {
-                        return ["hello"];
-                    }',
-                '5.6',
-                ['MissingReturnType'],
-                true,
-            ],
-            'addMissingStringArrayReturnType70' => [
-                '<?php
-                    function foo() {
-                        return ["hello"];
-                    }',
-                '<?php
-                    /**
-                     * @return string[]
-                     *
-                     * @psalm-return array{0: string}
-                     */
-                    function foo(): array {
-                        return ["hello"];
-                    }',
-                '7.0',
-                ['MissingReturnType'],
-                true,
-            ],
-            'addMissingObjectLikeReturnType70' => [
-                '<?php
-                    function foo() {
-                        return rand(0, 1) ? ["a" => "hello"] : ["a" => "goodbye", "b" => "hello again"];
-                    }',
-                '<?php
-                    /**
-                     * @return string[]
-                     *
-                     * @psalm-return array{a: string, b?: string}
-                     */
-                    function foo(): array {
-                        return rand(0, 1) ? ["a" => "hello"] : ["a" => "goodbye", "b" => "hello again"];
-                    }',
-                '7.0',
-                ['MissingReturnType'],
-                true,
-            ],
-            'addMissingObjectLikeReturnTypeWithEmptyArray' => [
-                '<?php
-                    function foo() {
-                        if (rand(0, 1)) {
-                            return [];
-                        }
-
-                        return [
-                            "a" => 1,
-                            "b" => 2,
-                        ];
-                    }',
-                '<?php
-                    /**
-                     * @return int[]
-                     *
-                     * @psalm-return array{a?: int, b?: int}
-                     */
-                    function foo(): array {
-                        if (rand(0, 1)) {
-                            return [];
-                        }
-
-                        return [
-                            "a" => 1,
-                            "b" => 2,
-                        ];
-                    }',
-                '7.0',
-                ['MissingReturnType'],
-                true,
-            ],
-            'addMissingObjectLikeReturnTypeWithNestedArrays' => [
-                '<?php
-                    function foo() {
-                        return [
-                            "a" => 1,
-                            "b" => 2,
-                            "c" => [
-                                "a" => 1,
-                                "b" => 2,
-                                "c" => [
-                                    "a" => 1,
-                                    "b" => 2,
-                                    "c" => 3,
-                                ],
-                            ],
-                        ];
-                    }',
-                '<?php
-                    /**
-                     * @return ((int|int[])[]|int)[]
-                     *
-                     * @psalm-return array{a: int, b: int, c: array{a: int, b: int, c: array{a: int, b: int, c: int}}}
-                     */
-                    function foo(): array {
-                        return [
-                            "a" => 1,
-                            "b" => 2,
-                            "c" => [
-                                "a" => 1,
-                                "b" => 2,
-                                "c" => [
-                                    "a" => 1,
-                                    "b" => 2,
-                                    "c" => 3,
-                                ],
-                            ],
-                        ];
-                    }',
-                '7.0',
-                ['MissingReturnType'],
-                true,
-            ],
-            'addMissingObjectLikeReturnTypeSeparateStatements70' => [
-                '<?php
-                    function foo() {
-                        if (rand(0, 1)) {
-                            return ["a" => "hello", "b" => "hello again"];
-                        }
-
-                        if (rand(0, 1)) {
-                            return ["a" => "hello", "b" => "hello again"];
-                        }
-
-                        return ["a" => "goodbye"];
-                    }',
-                '<?php
-                    /**
-                     * @return string[]
-                     *
-                     * @psalm-return array{a: string, b?: string}
-                     */
-                    function foo(): array {
-                        if (rand(0, 1)) {
-                            return ["a" => "hello", "b" => "hello again"];
-                        }
-
-                        if (rand(0, 1)) {
-                            return ["a" => "hello", "b" => "hello again"];
-                        }
-
-                        return ["a" => "goodbye"];
-                    }',
-                '7.0',
-                ['MissingReturnType'],
-                true,
-            ],
-            'addMissingStringArrayReturnTypeFromCall71' => [
-                '<?php
-                    /** @return string[] */
-                    function foo(): array {
-                        return ["hello"];
-                    }
-
-                    function bar() {
-                        return foo();
-                    }',
-                '<?php
-                    /** @return string[] */
-                    function foo(): array {
-                        return ["hello"];
-                    }
-
-                    /**
-                     * @return string[]
-                     *
-                     * @psalm-return array<array-key, string>
-                     */
-                    function bar(): array {
-                        return foo();
-                    }',
-                '7.1',
-                ['MissingReturnType'],
-                true,
-            ],
-            'addMissingDocblockStringArrayReturnTypeFromCall71' => [
-                '<?php
-                    /** @return string[] */
-                    function foo() {
-                        return ["hello"];
-                    }
-
-                    function bar() {
-                        return foo();
-                    }',
-                '<?php
-                    /** @return string[] */
-                    function foo() {
-                        return ["hello"];
-                    }
-
-                    /**
-                     * @return string[]
-                     *
-                     * @psalm-return array<array-key, string>
-                     */
-                    function bar() {
-                        return foo();
-                    }',
-                '7.1',
-                ['MissingReturnType'],
-                true,
-            ],
-            'addMissingNullableStringReturnType71' => [
-                '<?php
-                    /** @return string[] */
-                    function foo(): array {
-                        return ["hello"];
-                    }
-
-                    function bar() {
-                        foreach (foo() as $f) {
-                            return $f;
-                        }
-                        return null;
-                    }',
-                '<?php
-                    /** @return string[] */
-                    function foo(): array {
-                        return ["hello"];
-                    }
-
-                    /**
-                     * @return null|string
-                     */
-                    function bar() {
-                        foreach (foo() as $f) {
-                            return $f;
-                        }
-                        return null;
-                    }',
-                '7.1',
-                ['MissingReturnType'],
-                true,
-            ],
-            'addMissingNullableStringReturnTypeWithMaybeReturn71' => [
-                '<?php
-                    function foo() {
-                      if (rand(0, 1)) return new stdClass;
-                    }',
-                '<?php
-                    /**
-                     * @return null|stdClass
-                     */
-                    function foo() {
-                      if (rand(0, 1)) return new stdClass;
-                    }',
-                '7.1',
-                ['MissingReturnType'],
-                true,
-            ],
-            'addMissingUnsafeNullableStringReturnType71' => [
-                '<?php
-                    /** @return string[] */
-                    function foo(): array {
-                        return ["hello"];
-                    }
-
-                    function bar() {
-                        foreach (foo() as $f) {
-                            return $f;
-                        }
-                        return null;
-                    }',
-                '<?php
-                    /** @return string[] */
-                    function foo(): array {
-                        return ["hello"];
-                    }
-
-                    function bar(): ?string {
-                        foreach (foo() as $f) {
-                            return $f;
-                        }
-                        return null;
-                    }',
-                '7.1',
-                ['MissingReturnType'],
-                false,
-            ],
-            'addSelfReturnType' => [
-                '<?php
-                    class A {
-                        public function foo() {
-                            return $this;
-                        }
-                    }',
-                '<?php
-                    class A {
-                        public function foo(): self {
-                            return $this;
-                        }
-                    }',
-                '7.1',
-                ['MissingReturnType'],
-                false,
-            ],
-            'addIterableReturnType' => [
-                '<?php
-                    function foo() {
-                        return bar();
-                    }
-
-                    function bar(): iterable {
-                        return [1, 2, 3];
-                    }',
-                '<?php
-                    function foo(): iterable {
-                        return bar();
-                    }
-
-                    function bar(): iterable {
-                        return [1, 2, 3];
-                    }',
-                '7.1',
-                ['MissingReturnType'],
-                false,
-            ],
-            'addGenericIterableReturnType' => [
-                '<?php
-                    function foo() {
-                        return bar();
-                    }
-
-                    /** @return iterable<int> */
-                    function bar(): iterable {
-                        return [1, 2, 3];
-                    }',
-                '<?php
-                    /**
-                     * @return iterable
-                     *
-                     * @psalm-return iterable<mixed, int>
-                     */
-                    function foo(): iterable {
-                        return bar();
-                    }
-
-                    /** @return iterable<int> */
-                    function bar(): iterable {
-                        return [1, 2, 3];
-                    }',
-                '7.1',
-                ['MissingReturnType'],
-                false,
-            ],
-            'addMissingNullableReturnTypeInDocblockOnly71' => [
-                '<?php
-                    function foo() {
-                      if (rand(0, 1)) {
-                        return;
-                      }
-
-                      return "hello";
-                    }
-
-                    function bar() {
-                      if (rand(0, 1)) {
-                        return;
-                      }
-
-                      if (rand(0, 1)) {
-                        return null;
-                      }
-
-                      return "hello";
-                    }',
-                '<?php
-                    /**
-                     * @return null|string
-                     */
-                    function foo() {
-                      if (rand(0, 1)) {
-                        return;
-                      }
-
-                      return "hello";
-                    }
-
-                    /**
-                     * @return null|string
-                     */
-                    function bar() {
-                      if (rand(0, 1)) {
-                        return;
-                      }
-
-                      if (rand(0, 1)) {
-                        return null;
-                      }
-
-                      return "hello";
-                    }',
-                '7.1',
-                ['MissingReturnType'],
-                false,
-            ],
-            'addMissingVoidReturnTypeToOldArray71' => [
-                '<?php
-                    function foo(array $a = array()) {}
-                    function bar(array $a = array() )  {}',
-                '<?php
-                    function foo(array $a = array()): void {}
-                    function bar(array $a = array() ): void  {}',
-                '7.1',
-                ['MissingReturnType'],
-                false,
-            ],
             'addMissingVoidReturnTypeClosureUse71' => [
                 '<?php
                     $a = "foo";
@@ -594,207 +36,6 @@ class ReturnTypeManipulationTest extends FileManipulationTest
                 ['MissingClosureReturnType'],
                 false,
             ],
-            'dontAddMissingVoidReturnType56' => [
-                '<?php
-                    /** @return void */
-                    function foo() { }
-
-                    function bar() {
-                        return foo();
-                    }',
-                '<?php
-                    /** @return void */
-                    function foo() { }
-
-                    function bar() {
-                        return foo();
-                    }',
-                '5.6',
-                ['MissingReturnType'],
-                true,
-            ],
-            'dontAddMissingVoidReturnTypehintForSubclass71' => [
-                '<?php
-                    class A {
-                        public function foo() {}
-                    }
-
-                    class B extends A {
-                        public function foo() {}
-                    }',
-                '<?php
-                    class A {
-                        /**
-                         * @return void
-                         */
-                        public function foo() {}
-                    }
-
-                    class B extends A {
-                        /**
-                         * @return void
-                         */
-                        public function foo() {}
-                    }',
-                '7.1',
-                ['MissingReturnType'],
-                true,
-            ],
-            'dontAddMissingVoidReturnTypehintForPrivateMethodInSubclass71' => [
-                '<?php
-                    class A {
-                        private function foo() {}
-                    }
-
-                    class B extends A {
-                        private function foo() {}
-                    }',
-                '<?php
-                    class A {
-                        private function foo(): void {}
-                    }
-
-                    class B extends A {
-                        private function foo(): void {}
-                    }',
-                '7.1',
-                ['MissingReturnType'],
-                true,
-            ],
-            'dontAddMissingClassReturnTypehintForSubclass71' => [
-                '<?php
-                    class A {
-                        public function foo() {
-                            return $this;
-                        }
-                    }
-
-                    class B extends A {
-                        public function foo() {
-                            return $this;
-                        }
-                    }',
-                '<?php
-                    class A {
-                        /**
-                         * @return self
-                         */
-                        public function foo() {
-                            return $this;
-                        }
-                    }
-
-                    class B extends A {
-                        /**
-                         * @return self
-                         */
-                        public function foo() {
-                            return $this;
-                        }
-                    }',
-                '7.1',
-                ['MissingReturnType'],
-                true,
-            ],
-            'dontAddMissingClassReturnTypehintForSubSubclass71' => [
-                '<?php
-                    class A {
-                        public function foo() {
-                            return $this;
-                        }
-                    }
-
-                    class B extends A {}
-
-                    class C extends B {
-                        public function foo() {
-                            return $this;
-                        }
-                    }',
-                '<?php
-                    class A {
-                        /**
-                         * @return self
-                         */
-                        public function foo() {
-                            return $this;
-                        }
-                    }
-
-                    class B extends A {}
-
-                    class C extends B {
-                        /**
-                         * @return self
-                         */
-                        public function foo() {
-                            return $this;
-                        }
-                    }',
-                '7.1',
-                ['MissingReturnType'],
-                true,
-            ],
-            'addMissingTemplateReturnType' => [
-                '<?php
-                    /**
-                     * @template T as object
-                     *
-                     * @param object $t Flabble
-                     *
-                     * @psalm-param T $t
-                     */
-                    function foo($t) {
-                        return $t;
-                    }',
-                '<?php
-                    /**
-                     * @template T as object
-                     *
-                     * @param object $t Flabble
-                     *
-                     * @psalm-param T $t
-                     *
-                     * @return object
-                     *
-                     * @psalm-return T
-                     */
-                    function foo($t) {
-                        return $t;
-                    }',
-                '7.4',
-                ['MissingReturnType'],
-                true
-            ],
-            'missingReturnTypeAnonymousClass' => [
-                '<?php
-                    function logger() {
-                        return new class {};
-                    }',
-                '<?php
-                    function logger(): object {
-                        return new class {};
-                    }',
-                '7.4',
-                ['MissingReturnType'],
-                true
-            ],
-            'missingReturnTypeAnonymousClassPre72' => [
-                '<?php
-                    function logger() {
-                        return new class {};
-                    }',
-                '<?php
-                    /**
-                     * @return object
-                     */
-                    function logger() {
-                        return new class {};
-                    }',
-                '7.1',
-                ['MissingReturnType'],
-                true
-            ],
             'fixInvalidIntReturnType56' => [
                 '<?php
                     /**
@@ -1135,66 +376,6 @@ class ReturnTypeManipulationTest extends FileManipulationTest
                 ['LessSpecificReturnType'],
                 true,
             ],
-            'addMissingReturnTypeWhenParentHasNone' => [
-                '<?php
-                    class A {
-                        /** @psalm-suppress MissingReturnType */
-                        public function foo() {
-                            return;
-                        }
-                    }
-
-                    class B extends A {
-                        public function foo() {
-                            return;
-                        }
-                    }',
-                '<?php
-                    class A {
-                        /** @psalm-suppress MissingReturnType */
-                        public function foo() {
-                            return;
-                        }
-                    }
-
-                    class B extends A {
-                        /**
-                         * @return void
-                         */
-                        public function foo() {
-                            return;
-                        }
-                    }',
-                '7.1',
-                ['MissingReturnType'],
-                false,
-            ],
-            'dontAddMissingReturnTypeWhenChildHasNone' => [
-                '<?php
-                    class A {
-                        public function foo() {}
-                    }
-
-                    class B extends A {
-                        /** @psalm-suppress MissingReturnType */
-                        public function foo() {}
-                    }',
-                '<?php
-                    class A {
-                        /**
-                         * @return void
-                         */
-                        public function foo() {}
-                    }
-
-                    class B extends A {
-                        /** @psalm-suppress MissingReturnType */
-                        public function foo() {}
-                    }',
-                '7.1',
-                ['MissingReturnType'],
-                false,
-            ],
             'fixInvalidIntReturnTypeJustInPhpDoc' => [
                 '<?php
                     class A {
@@ -1306,24 +487,6 @@ class ReturnTypeManipulationTest extends FileManipulationTest
                 false,
                 false,
             ],
-            'noEmptyArrayAnnotation' => [
-                '<?php
-                    function foo() {
-                        return [];
-                    }',
-                '<?php
-                    /**
-                     * @return array
-                     *
-                     * @psalm-return array<empty, empty>
-                     */
-                    function foo(): array {
-                        return [];
-                    }',
-                '7.3',
-                ['MissingReturnType'],
-                false,
-            ],
             'dontReplaceValidReturnTypePreventingBackwardsIncompatibility' => [
                 '<?php
                     class A {